]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Tue, 10 Jul 2012 20:53:39 +0000 (22:53 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Tue, 10 Jul 2012 20:53:39 +0000 (22:53 +0200)
commitb9e6d37efb3ae3c55305ee334fd2b0fa7dec14df
treed4defbf6b2d6a71d4314416260140ebe32c0b45e
parenta65394646cf24d679bd5c3d546db72e7cde6a65b
parent9b74f2de11e477e5d9d010a96e9af49690ae56d1
Merge branch 'master' into next