Merge branch 'backport' into 3.4
authorMikael Magnusson <mikachu@gmail.com>
Thu, 29 Jan 2009 21:46:04 +0000 (22:46 +0100)
committerMikael Magnusson <mikachu@gmail.com>
Thu, 29 Jan 2009 21:46:04 +0000 (22:46 +0100)
commitdd4ea774f80723518f8df87e0892213dd504ec97
tree44ac37147e1710bd1d2d9fa6b30a3050053443aa
parent080d6fdd31f873e8727ccae060cad7fa73108473
parentd0829d4416d83fda4aa4ec8d5f0a7003b0a7f148
Merge branch 'backport' into 3.4
openbox/client.h
openbox/frame.c
po/en@boldquot.po
po/en@quot.po