Merge branch 'backport' into work
authorDana Jansens <danakj@orodu.net>
Thu, 28 Feb 2008 02:07:10 +0000 (21:07 -0500)
committerDana Jansens <danakj@orodu.net>
Thu, 28 Feb 2008 02:07:10 +0000 (21:07 -0500)
commit8bd02bf4b883fa369dd68df2053974407024ddaf
tree7c765a1d4faa2812fe1993f5ec3ca45ee21ea005
parent26cc41f6c6187dabd5c7ee4365c8fa44751009e5
parentfbacc56d9d0792631b5160df1244ee10214db37d
Merge branch 'backport' into work

Conflicts:

openbox/actions/execute.c
openbox/actions/execute.c
openbox/actions/exit.c
po/POTFILES.in