]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sun, 10 Jun 2012 19:30:36 +0000 (21:30 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Sun, 10 Jun 2012 19:30:36 +0000 (21:30 +0200)
commitd4f8450ea9559024d8643ac23168750744b95ea0
tree93ecce13594d0361f70af2e24b3b160889f0cee8
parentf28afc8f6b43ad6ee9ff8cbd4ffaa70d5ae343ca
parent1ad6eea4a87a6e0c8f1af797a94f30b508ac114d
Merge branch 'master' into next
docs/userguide