Merge branch 'backport' into 3.4
authorMikael Magnusson <mikachu@gmail.com>
Fri, 20 Feb 2009 16:42:48 +0000 (17:42 +0100)
committerMikael Magnusson <mikachu@gmail.com>
Fri, 20 Feb 2009 16:42:48 +0000 (17:42 +0100)
1  2 
data/rc.xml
openbox/config.c

diff --cc data/rc.xml
Simple merge
Simple merge