Merge branch 'backport' into work
authorMikael Magnusson <mikachu@gmail.com>
Sat, 15 Nov 2008 21:53:02 +0000 (22:53 +0100)
committerMikael Magnusson <mikachu@gmail.com>
Sat, 15 Nov 2008 21:53:02 +0000 (22:53 +0100)
commita1746ab2158da2324aefb7ce81e7b5edc9c41e79
treed74e132e17c57ea12b7c0731c17c624775d3a938
parentc230443c6596039f426542f5a286120891a745c5
parente59d06c7f3ede4911c8ab08c101f6b0322a0ea58
Merge branch 'backport' into work

Conflicts:
openbox/event.c
openbox/client.c
openbox/event.c
openbox/screen.c