Merge branch 'backport' into work
authorMikael Magnusson <mikachu@gmail.com>
Fri, 20 Feb 2009 16:44:16 +0000 (17:44 +0100)
committerMikael Magnusson <mikachu@gmail.com>
Fri, 20 Feb 2009 16:44:16 +0000 (17:44 +0100)
commit6d0c4d7fadd2d67760ef62e11385fd261ba6a3c4
tree525d8e465ad96fcf6f16400ece60678d559eeb23
parent4145468a1984e1055a947ad957075ae51f70ca9c
parent271e0fd9c87a97bb066b35f537a052235413fe5f
Merge branch 'backport' into work

Conflicts:
openbox/config.c
data/rc.xml
openbox/config.c