From: Mikael Magnusson <mikachu@gmail.com>
Date: Sat, 23 Aug 2008 04:32:25 +0000 (+0200)
Subject: Merge branch '3.4' into wip/mikabox
X-Git-Tag: mikabox-3.4.7.2~31
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=09a7c153ee029253d6801ddf340b884c8da57028;p=mikachu%2Fopenbox.git

Merge branch '3.4' into wip/mikabox
---

09a7c153ee029253d6801ddf340b884c8da57028