Merge branch 'backport' into 3.4-working
authorDana Jansens <danakj@orodu.net>
Sat, 1 Mar 2008 06:24:59 +0000 (01:24 -0500)
committerDana Jansens <danakj@orodu.net>
Sat, 1 Mar 2008 06:24:59 +0000 (01:24 -0500)
commitbf52dae83e703a904f2589a91790d3018c9e6a54
tree4335d301213110d5ea0247a5ee3195e8e3c70ffa
parent1c686c8c3f20af3c7daee824d4186235055bf9dc
parentfd34bcf71ab032b16be5268b2f9b7aeaf84fcc6a
Merge branch 'backport' into 3.4-working
openbox/frame.c
openbox/openbox.c
po/en@boldquot.po
po/en@quot.po