]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Wed, 9 Jan 2013 17:11:17 +0000 (18:11 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Wed, 9 Jan 2013 17:11:17 +0000 (18:11 +0100)
commitfc0e80ee7f94c74a6b9097299870c80f18c8bfe7
tree48b721e0c40e95ecec573d56c861f79f745382cf
parent527ec2a69c7e6a8a08abb6b4a12ea74b40186013
parent1b6ea35eb6362ab8caf4c6947016c92b35b22f10
Merge branch 'master' into next