]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sun, 10 Jun 2012 16:31:54 +0000 (18:31 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Sun, 10 Jun 2012 16:31:54 +0000 (18:31 +0200)
commitf96e998abb2f27de93cc4404b017060d4bdec6d0
tree37be1745f497af68ae402d3bfbd0668a5289b298
parent3f37458b7cca67e01819d622567aedf35331d73e
parent3587155c47ea1c70c55ba636b7b98347b18ebe11
Merge branch 'master' into next