]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Fri, 26 Aug 2011 17:18:16 +0000 (19:18 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Fri, 26 Aug 2011 17:18:16 +0000 (19:18 +0200)
commit7d2978ead4c45cc08b6decb98dafae3e4d665497
treeca9cd9a46047d096712ea5b4a2ee3334a47e20e7
parentafff328c59071afe03d1788f49c57587877380de
parentffb5c7d50c4bb615deb45a4050b9abacb4b76b40
Merge branch 'master' into next