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)
commit8bc0dcd7fb6e63cbd81037d530b3313cb71d1e36
treec292aab056c5e6442b89b860f09b8cd84c96181b
parent288ef5896bfa2720718e462313acf69ea95a3086
parentefc7efcd42db3a0c84dcfaf1d7abbe852ca16dac
Merge branch 'master' of git://git.openbox.org/dana/openbox