Merge branch 'backport' into work
authorDana Jansens <danakj@orodu.net>
Thu, 21 Feb 2008 18:24:19 +0000 (13:24 -0500)
committerDana Jansens <danakj@orodu.net>
Thu, 21 Feb 2008 18:24:19 +0000 (13:24 -0500)
commit198d98986bdf224ed29361541d19841339953088
treee0a588f29ce1f1c3102da4daf05316a15e9a6cea
parent3263845459d15da683b7cab92fb856acbdf2800e
parentc49c2a8e408f7482f2b977d6cf97517684476ed7
Merge branch 'backport' into work

Conflicts:

openbox/openbox.c
openbox/session.c
openbox/actions.c
openbox/actions/execute.c
openbox/actions/moveresizeto.c
openbox/config.c
openbox/menu.c
openbox/mouse.c
openbox/openbox.c
openbox/session.c
openbox/translate.c