Merge branch 'master' of git://git.openbox.org/dana/openbox
authorMikael Magnusson <mikachu@gmail.com>
Tue, 3 Mar 2015 21:37:21 +0000 (22:37 +0100)
committerMikael Magnusson <mikachu@gmail.com>
Tue, 3 Mar 2015 21:37:21 +0000 (22:37 +0100)

Trivial merge