]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Wed, 17 Aug 2011 10:17:29 +0000 (12:17 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Wed, 17 Aug 2011 10:17:29 +0000 (12:17 +0200)
commit7eacf8dd049dd2e92ae4e5e92f12f148290e81fa
treead5e2fcfad528b9b141aed155830d04e84c9f127
parent7a22bd1cf3b8cdc3694084f311c405997103d391
parent13ecbf43c9700799e7cd8c276587c2c4a4d3f632
Merge branch 'master' into next