]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Thu, 30 Jul 2015 20:27:15 +0000 (22:27 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Thu, 30 Jul 2015 20:27:15 +0000 (22:27 +0200)
commit2bde6f080ecd5d0e2dccb20a1936a5d40af7ff84
tree37876c950a0e7bbccf7d86212bfb0ba9adf9e380
parent8c116e228b16a7929a256e0aa682232dbde8babf
parenta4ffb23d207ce4cf29fa3efe5e64e6ea2cc54a4c
Merge branch 'master' into next