]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sat, 12 May 2012 06:24:20 +0000 (08:24 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Sat, 12 May 2012 06:24:20 +0000 (08:24 +0200)
commit85d6c75b947b7085cb50397bbaaf353c7aaad0b1
tree344fb291f950bda44545d93a835e19531841b131
parented957d60a76480fede5f4efc5c12467718144b03
parentd1443f9c71a27706de9d05cd9336d6e555ef9a60
Merge branch 'master' into next