]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Wed, 3 Aug 2011 22:16:13 +0000 (00:16 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Wed, 3 Aug 2011 22:16:13 +0000 (00:16 +0200)
commit0330e868bce18d0b0c871fbabddefe0ed3826b32
tree8eb7b3223051bea0b4f79d0ff15b1ee12d0bc6ca
parent2e0f5335f45c1b698e62627db3a63862b1281efd
parent4fd877608d37a95b3422520d933a8b396d4ca823
Merge branch 'master' into next