]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Wed, 19 Dec 2012 20:40:53 +0000 (21:40 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Wed, 19 Dec 2012 20:40:53 +0000 (21:40 +0100)
commitbb3ae9f960847c3801e5d52129d08f249ca8f3f6
tree459252884f970a9381a976805ad36a94b916fce3
parent895f8e05c8d933b15d3f267e1e581cff8caf6a5c
parent770ead62228e05e37c8e70fa053c7c1ecca3d48b
Merge branch 'master' into next