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)
1  2 
openbox/client.h
openbox/frame.c
po/en@boldquot.po
po/en@quot.po

Simple merge
diff --cc openbox/frame.c
Simple merge
Simple merge
diff --cc po/en@quot.po
Simple merge