]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Wed, 3 Aug 2011 22:41:11 +0000 (00:41 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Wed, 3 Aug 2011 22:41:11 +0000 (00:41 +0200)
commit65ce6fe264306b4ca0bec09a42d204985c18da2b
treedf0aa7909822ec57037b4b109a741d739fdcee98
parent926ca651efdd7e63c20b8582fdcdc33652631f55
parent3d7f0f4ce3fee90f06bca84b8fcb9d0ab3f7bb73
Merge branch 'master' into next