]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sun, 18 Sep 2011 13:39:33 +0000 (14:39 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Sun, 18 Sep 2011 13:39:33 +0000 (14:39 +0100)
commitc88425147eb701114d9171ff0fcb6f161b9da9c1
treefb80b7141685c2e686dafcbd994605127bf68336
parent5c57e205f0f9024520cf97cfb5092abacc6aff2a
parent254299b4cdc8244cd3b0d9b8a00e0d02da2cce15
Merge branch 'master' into next