]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Tue, 23 Aug 2011 19:32:56 +0000 (21:32 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Tue, 23 Aug 2011 19:32:56 +0000 (21:32 +0200)
commitb28457f66380484093d03236e8635a15e4d855bf
tree563de37adba976d153142a3de966c06d8cf017d9
parentcc2ca32b13d15125a4a7f83ddf1af2b55b4bbb13
parent3f147b77aba1eb09d9f714ce1acee0067c27b17f
Merge branch 'master' into next