]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Thu, 4 Aug 2011 18:11:44 +0000 (20:11 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Thu, 4 Aug 2011 18:11:44 +0000 (20:11 +0200)
commite9395149b9cac66606ecbbc3166a2151a9b6469f
treeec1bf1edddb6a46250b53c06fdb9702a8c58431b
parent65ce6fe264306b4ca0bec09a42d204985c18da2b
parent8510a4e3220668c779d6b961f14fc79358188c2c
Merge branch 'master' into next