]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'release-4.1.2'
authorMichael Stapelberg <michael@stapelberg.de>
Fri, 27 Jan 2012 19:26:42 +0000 (19:26 +0000)
committerMichael Stapelberg <michael@stapelberg.de>
Fri, 27 Jan 2012 19:26:42 +0000 (19:26 +0000)

Trivial merge