Merge branch 'backport' into work
authorDana Jansens <danakj@orodu.net>
Thu, 14 Feb 2008 20:14:55 +0000 (15:14 -0500)
committerDana Jansens <danakj@orodu.net>
Thu, 14 Feb 2008 20:14:55 +0000 (15:14 -0500)
commite1b4b9eb17b3ea145dbdce28dbf278437e349be1
tree5357a81615cf404429106ffcf6ba0b9965b033a6
parentb01dd0b20fedb27681ceda53deb8c7f2f83eabc3
parentcec5480108e2d4158ba5086223e07cc34587dff5
Merge branch 'backport' into work
openbox/config.c