]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Wed, 3 Aug 2011 18:44:18 +0000 (20:44 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Wed, 3 Aug 2011 18:44:18 +0000 (20:44 +0200)
commit2d155efa07e1983e12debb3b78dcd4458c840ca6
treef2249492bf8f966bb230734acab419ae1b45f3be
parent583fd93aefdb566dcb1d4f8bc801a53ceab9826d
parentb4882dc2b8b7a4b72b49b6a8fa5c5cc945d58020
Merge branch 'master' into next