]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Mon, 3 Oct 2011 18:31:12 +0000 (19:31 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Mon, 3 Oct 2011 18:31:12 +0000 (19:31 +0100)
commit201268d9b2014fcd91a3258dddf43d2e8235016e
tree54dd8446a62501f24f93fc6ebd8b9613f84a0439
parent963c8cfb2087329baab7c4b3bf947f8b57b7b3fb
parentf4877773c39c5d254ba8efedfe3c39641ee8bb95
Merge branch 'master' into next