]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'fix-scratchpad-focus'
authorMichael Stapelberg <michael@stapelberg.de>
Fri, 14 Sep 2012 11:18:00 +0000 (13:18 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Fri, 14 Sep 2012 11:18:00 +0000 (13:18 +0200)

Trivial merge