]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sat, 17 Dec 2011 15:28:51 +0000 (15:28 +0000)
committerMichael Stapelberg <michael@stapelberg.de>
Sat, 17 Dec 2011 15:28:51 +0000 (15:28 +0000)
Conflicts:
debian/changelog

1  2 
testcases/t/100-fullscreen.t

Simple merge