]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Thu, 4 Aug 2011 21:37:40 +0000 (23:37 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Thu, 4 Aug 2011 21:37:40 +0000 (23:37 +0200)
commit6e95004d6cb2e6dd2f342cef4c51b1d2fc8de3f9
tree540d3b11ddd74549948673d220d00c54c521ed14
parent93c3596619d35ac1f69668274997a9b248a2fb67
parentd4f32382c9b1790c8059371b72e3d2645985496e
Merge branch 'master' into next