From: Dana Jansens <danakj@orodu.net>
Date: Mon, 16 Jul 2007 13:58:33 +0000 (-0400)
Subject: Merge branch 'master' of git://mikachu.ath.cx/openbox into 3.4
X-Git-Tag: release-3.4.3~30
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=eb9fbd63dd97650523a8a1e004f0088da109b5ef;p=dana%2Fopenbox.git

Merge branch 'master' of git://mikachu.ath.cx/openbox into 3.4
---

eb9fbd63dd97650523a8a1e004f0088da109b5ef