]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sun, 18 Dec 2011 18:02:08 +0000 (18:02 +0000)
committerMichael Stapelberg <michael@stapelberg.de>
Sun, 18 Dec 2011 18:02:08 +0000 (18:02 +0000)
Conflicts:
testcases/t/159-socketpaths.t


No differences found