]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Wed, 3 Aug 2011 12:49:33 +0000 (14:49 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Wed, 3 Aug 2011 12:49:33 +0000 (14:49 +0200)
commit583fd93aefdb566dcb1d4f8bc801a53ceab9826d
tree72c3bbdeb2c66bbc071de71c4e17f3e763eae49d
parent746472e5e44db7f346a08c9906693a2cb4be1ac3
parent04a4d7c44a93d43f426c8400e83bbd6de5a167fb
Merge branch 'master' into next