]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sun, 7 Aug 2011 15:56:37 +0000 (17:56 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Sun, 7 Aug 2011 15:56:37 +0000 (17:56 +0200)
commit9260cd7e12a15398d8963b04231a6f3b59f9bf4d
treed5ec21e17264afe768695d8d443bd7fcef7d8914
parent94ba65579494b6780702b1a724c5befa6e0f5a13
parente17d49e6a4cf4236b2b4cf7fafa3b7c62032b96c
Merge branch 'master' into next