Merge branch 'backport' into 3.4-working
authorDana Jansens <danakj@orodu.net>
Sun, 3 Feb 2008 23:39:08 +0000 (18:39 -0500)
committerDana Jansens <danakj@orodu.net>
Sun, 3 Feb 2008 23:39:08 +0000 (18:39 -0500)
commit565f14acc02d8b12734263e292974f90503246b2
treef979b9677000ed916b8c749dd3d943e17c465d0f
parent1e0d47b55ceab763b0daf819d3c5a8b5d282f70d
parent4d5dd00229c3cfcacfc98b4194702d513283edf1
Merge branch 'backport' into 3.4-working
openbox/config.c