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

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

9e4f4da7f09c525db2015dc20eb300e552c4d7f7