]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Mon, 28 Nov 2011 23:28:03 +0000 (23:28 +0000)
committerMichael Stapelberg <michael@stapelberg.de>
Mon, 28 Nov 2011 23:28:03 +0000 (23:28 +0000)
commit752b1019162b13ac9975634d5974ebd1f34c14a5
tree841403bcf0b33a6bc6507bd3ff9a46e229e1585e
parent356d80c15b880081a518aaa87a2531ff864b1404
parent2fb06e612f026247d475c846db1e76338fd4f5ff
Merge branch 'master' into next