From: Dana Jansens <danakj@orodu.net>
Date: Thu, 19 Jul 2007 21:05:17 +0000 (-0400)
Subject: Merge branch 'master' into 3.4-working
X-Git-Tag: release-3.4.3~15
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=7823b90532c17799aa9c4b0896bbea2e5a664cf5;p=dana%2Fopenbox.git

Merge branch 'master' into 3.4-working
---

7823b90532c17799aa9c4b0896bbea2e5a664cf5