Merge branch 'backport' into 3.4-working
authorDana Jansens <danakj@orodu.net>
Mon, 11 Jan 2010 18:44:13 +0000 (13:44 -0500)
committerDana Jansens <danakj@orodu.net>
Mon, 11 Jan 2010 18:44:13 +0000 (13:44 -0500)
commitafd58f651ea884c40ac5af32f2f3e023222b5275
tree9f20526c029eaaa6bbc13cf83327c92747f20190
parent492e606f151879a7f9ffc687e188d5f5e5b20eb6
parent358056b102f633cb63ac7b9aa0cfdd25af77ddf3
Merge branch 'backport' into 3.4-working

Conflicts:

configure.ac
configure.ac
data/rc.xml
openbox/client.c
openbox/prop.h