From: Mikael Magnusson <mikachu@gmail.com>
Date: Tue, 3 Mar 2015 21:37:21 +0000 (+0100)
Subject: Merge branch 'master' of git://git.openbox.org/dana/openbox
X-Git-Tag: release-3.6.0~4
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=8bc0dcd7fb6e63cbd81037d530b3313cb71d1e36;p=mikachu%2Fopenbox.git

Merge branch 'master' of git://git.openbox.org/dana/openbox
---

8bc0dcd7fb6e63cbd81037d530b3313cb71d1e36