]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sun, 7 Aug 2011 16:03:56 +0000 (18:03 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Sun, 7 Aug 2011 16:03:56 +0000 (18:03 +0200)
commit091b72f3a904a9d26b679b6a475f84cbdfdd6c2c
tree56728931bf62a1ae451489d90364a5606e5426c1
parent9260cd7e12a15398d8963b04231a6f3b59f9bf4d
parent503f318b532d7c373419844e7e4673b0484c3a9f
Merge branch 'master' into next