Merge branch 'backport' into 3.4-working
authorDana Jansens <danakj@orodu.net>
Tue, 8 Dec 2009 19:23:52 +0000 (14:23 -0500)
committerDana Jansens <danakj@orodu.net>
Tue, 8 Dec 2009 19:23:52 +0000 (14:23 -0500)
1  2 
openbox/client.c
openbox/client.h

Simple merge
Simple merge