]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sat, 1 Oct 2011 16:44:46 +0000 (17:44 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Sat, 1 Oct 2011 16:44:46 +0000 (17:44 +0100)
commit0482dc754681eb8bf0c05ed46943b066813dae0c
tree85ea24acb542e35ef2d2a03d4aa7fa28564247f8
parent3629934b0ae2f3ed8d2453dc2ed47ed652b90eca
parent1f472b096289c2a6f283a9517c5b32aa6fc21744
Merge branch 'master' into next