]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sun, 24 Jun 2012 19:22:44 +0000 (21:22 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Sun, 24 Jun 2012 19:22:44 +0000 (21:22 +0200)
commit97a5fb2ec0ef410858f1e9755275c06280967c6d
treea5c09bf2d95556b86aa3e46b476ba093050acacf
parent23c28e52084f2090140c7c3c85281128f65d48fb
parent27a5cceb6116b175ef354d56d682cb3700e9c345
Merge branch 'master' into next