]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sun, 1 Sep 2013 11:35:19 +0000 (13:35 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Sun, 1 Sep 2013 11:35:19 +0000 (13:35 +0200)
commita52b5212ea5093ee3cb1bc5a191bb3f85ddbb93d
tree1704d039df0b661a34cdc67ffdd223c3a11e84b1
parent599a4d48e61c9f4293069cdbe8aee245339b8f2d
parent0fbc40ff5fb61b692abdfaf657b0632c979b7997
Merge branch 'master' into next