]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Tue, 29 Nov 2011 20:50:11 +0000 (20:50 +0000)
committerMichael Stapelberg <michael@stapelberg.de>
Tue, 29 Nov 2011 20:50:11 +0000 (20:50 +0000)
commitdf2236c5ee5f4ad9f386c887e5f4d0647138a0ee
tree54441218a28544fa75e2364328cbf4bfbe8630b9
parent752b1019162b13ac9975634d5974ebd1f34c14a5
parent40ad2f182b14543abcaede14bd2c6c463f7aa0c3
Merge branch 'master' into next