]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Thu, 4 Aug 2011 20:21:42 +0000 (22:21 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Thu, 4 Aug 2011 20:21:42 +0000 (22:21 +0200)
commit93c3596619d35ac1f69668274997a9b248a2fb67
treea052ed94e3a490a127be4f0d2aa5684eb7044d58
parent31724a9a92cc7ccc2e8365d893354c0c32084869
parent93f475778f22dabdaa7b1fd318ca0c0b393b74a8
Merge branch 'master' into next