Merge branch 'backport' into 3.4
authorMikael Magnusson <mikachu@gmail.com>
Wed, 29 Oct 2008 12:48:45 +0000 (13:48 +0100)
committerMikael Magnusson <mikachu@gmail.com>
Wed, 29 Oct 2008 12:48:45 +0000 (13:48 +0100)
1  2 
openbox/actions/desktop.c
openbox/client.c

Simple merge
Simple merge