]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Wed, 3 Aug 2011 11:01:41 +0000 (13:01 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Wed, 3 Aug 2011 11:01:41 +0000 (13:01 +0200)
commit746472e5e44db7f346a08c9906693a2cb4be1ac3
tree7c06aff3f7c6186cdfd31dc1bc22109a0d82d0e8
parent521cc544f62e5b2b5fb949f62fce4660da46bfc7
parentcdae1b7f7492530f4e056cb929ff7d2b326d2d1f
Merge branch 'master' into next