]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Mon, 21 Nov 2011 19:56:03 +0000 (19:56 +0000)
committerMichael Stapelberg <michael@stapelberg.de>
Mon, 21 Nov 2011 19:56:03 +0000 (19:56 +0000)
commit70151ea238926555ea9f80230f53069b8e5b143b
treec7a0afaf25f43747f2231ec220548ba0d0ef703f
parent0f386a96e72ffc455b37118f74b8026c22d7fd5d
parent402daf30b7efc1448cb70d71b18689be302a2783
Merge branch 'master' into next