]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Thu, 20 Sep 2012 09:20:00 +0000 (11:20 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Thu, 20 Sep 2012 09:20:00 +0000 (11:20 +0200)
commitf039a0ded4c5d79a1abd4b882928b625feabc811
treeeb1d44235dfb957e0340822fb22e70ec073a2dbc
parent485b49bbe306563c7bd45a544ad06a7916fe40da
parent7e313b0385f18ad5c08f71d2a39ec1cb9d9de401
Merge branch 'master' into next