Merge branch 'backport' into work
authorMikael Magnusson <mikachu@gmail.com>
Sun, 26 Oct 2008 23:58:56 +0000 (00:58 +0100)
committerMikael Magnusson <mikachu@gmail.com>
Sun, 26 Oct 2008 23:58:56 +0000 (00:58 +0100)
Conflicts:
openbox/client.c
openbox/prop.c
openbox/prop.h


No differences found