]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sun, 28 Aug 2011 14:18:24 +0000 (16:18 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Sun, 28 Aug 2011 14:18:24 +0000 (16:18 +0200)
commit6037050015dc2204c14fbd6b3d048c96ae159ef7
treec41d90348905032167122a01255ea8a5bf1ea88e
parent16188af8bf24ecdd82c36ba41524a5c02fba97a6
parentb76b9be75af621cc5671d6d1137e8ee4f9e60d0b
Merge branch 'master' into next