]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Fri, 25 Jan 2013 12:56:26 +0000 (13:56 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Fri, 25 Jan 2013 12:56:26 +0000 (13:56 +0100)
1  2 
parser-specs/config.spec

Simple merge