]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Wed, 3 Aug 2011 18:49:01 +0000 (20:49 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Wed, 3 Aug 2011 18:49:01 +0000 (20:49 +0200)
commit4c3a8957eec8662cbce68673abbe31d23475fca9
tree6859c6bbe16133918b058ceadec84a49c27ae19b
parent2d155efa07e1983e12debb3b78dcd4458c840ca6
parentd0f1d8aa71371e5c952547580dd99650b065a480
Merge branch 'master' into next