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)
1  2 
openbox/config.c

Simple merge