]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Wed, 27 Jun 2012 15:49:36 +0000 (17:49 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Wed, 27 Jun 2012 15:49:36 +0000 (17:49 +0200)
commit072daa94b3f4e369ed9ef20a59a8b18c28170ef9
treed3fcc3f633a9a270f3a38bb375024af9e7323c67
parent7afb33d8f8eee5da984a802f59553acbed66bd71
parent3fe3fdd2f99bfce76374567016231d5f66e235a3
Merge branch 'master' into next