]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sat, 27 Aug 2011 13:28:34 +0000 (15:28 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Sat, 27 Aug 2011 13:28:34 +0000 (15:28 +0200)
1  2 
docs/userguide

diff --cc docs/userguide
Simple merge