]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Fri, 12 Aug 2011 21:11:13 +0000 (23:11 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Fri, 12 Aug 2011 21:11:13 +0000 (23:11 +0200)
commit2f116df901f9eddcfe351d09de884dad72b75ee6
treeae9ef7237cb521326db09118fc5f46a7b9f7ce58
parent4e0ccbf57b798356b3d4241ba24a020ebd3cc450
parentc8e6de1382dde60a3221d55d5351509007b446d0
Merge branch 'master' into next