]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Thu, 27 Sep 2012 10:10:14 +0000 (12:10 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Thu, 27 Sep 2012 10:10:14 +0000 (12:10 +0200)
commitdcf95fd312c5cf9af2309163dc04740e64baad0d
tree5ee0e21c979e53fa664f8732a5b1cb5a83a511a5
parentc31b3b296a9c30073ac133ccfe8e02fb57a37c3f
parent6a9fdebc877e7cb430e464e359a7bc55e98cf989
Merge branch 'master' into next