]> git.sur5r.net Git - i3/i3/commit
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)
commitc2061042e14f2d8f79b807fd36d79d6d9554804e
tree5a1aa40b5fc0c944ee4c23555a0ce5fcd04bc38f
parentfc3b0db7a50c476c8b67500f54f387e6a097aa11
parent8f4456a14a0eb2b6750c3cad643baab018136395
Merge branch 'master' into next
parser-specs/config.spec