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

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

69b76b965111ea0e2786257c48e7b4beb3f0dead