Merge branch 'backport' into work
authorMikael Magnusson <mikachu@comhem.se>
Mon, 3 Mar 2008 16:10:53 +0000 (17:10 +0100)
committerMikael Magnusson <mikachu@comhem.se>
Mon, 3 Mar 2008 16:10:53 +0000 (17:10 +0100)
commitd78ae0546dae17eda6084a1bd33e63637ba802e5
tree178e0210cf804c7ea9ed3690bae8b7d81b9fe0bf
parent4b5373f609e6462995a38cc4f0f50b17cbc8f835
parent40996c42b3b3dae96338abac1a250a905d0fd8d9
Merge branch 'backport' into work

Conflicts:

openbox/session.c
openbox/actions/session.c
openbox/session.c