]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Mon, 18 Feb 2013 23:28:05 +0000 (00:28 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Mon, 18 Feb 2013 23:28:05 +0000 (00:28 +0100)
commitd5358a749e3f4eed45144a2c78032c4163ea2367
tree4c8c29928ab8f6ffe79b319c7689106b21be7440
parent2922603cc4e2c5b36b6afea5127bcef9b11ab759
parent4fdf62eb2a1f826520b828c0da057650075eeeed
Merge branch 'master' into next