]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sun, 10 Jun 2012 19:05:58 +0000 (21:05 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Sun, 10 Jun 2012 19:05:58 +0000 (21:05 +0200)
commitf28afc8f6b43ad6ee9ff8cbd4ffaa70d5ae343ca
tree83ab0b9ea2cc2e9c38bc4bc54f62ba766dc4b8ea
parentf96e998abb2f27de93cc4404b017060d4bdec6d0
parent67c425ad97a6db754677672042aa7eefc46a0a8a
Merge branch 'master' into next