]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Fri, 18 May 2012 07:14:38 +0000 (09:14 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Fri, 18 May 2012 07:14:38 +0000 (09:14 +0200)
commitd154d347ece8984d79597025c88dcc25f1eded1c
treef066f059a14dd183b52948877cad817265713a43
parente969ed502b1d7de7a414fcd1bc1892de35edd6b2
parent04b5ec8165d712ed6bfab86006b755b31a73ccc1
Merge branch 'master' into next