]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Wed, 17 Aug 2011 11:44:01 +0000 (13:44 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Wed, 17 Aug 2011 11:44:01 +0000 (13:44 +0200)
commit06ef7f72e4d7797c71cf07758fd72c0edad68296
treeca4672b599b20d0fa70259cee94846f33bae51b6
parent4cf2cab626d16d1b9de3dc93e0a8ebb1da8a0351
parentf3cfd3fce3b22aeed7673a010bef1b3a9b1c9b0d
Merge branch 'master' into next