]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Thu, 22 Sep 2011 22:11:14 +0000 (23:11 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Thu, 22 Sep 2011 22:11:14 +0000 (23:11 +0100)
commitdaebe28b093bdf1f033041edabe9a80da1cc077a
tree2ccb3bcf1e4f1f9232d41a1090e0b444b8c3315b
parent1717b88174d26ed946bea0a0038a8a999fc2387f
parent30dea1fda6798a0a1dcfad4b2fdd36c18f2108e5
Merge branch 'master' into next