]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sun, 10 Jun 2012 16:21:18 +0000 (18:21 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Sun, 10 Jun 2012 16:21:18 +0000 (18:21 +0200)
commitbb167f6bed66ac09cfb5cd6667ec2c4846291ad0
tree07b6a8ebdbaaffb657a0503224964d2c841ea69e
parent5a29e61a4605cb3a1a9333d8e85d9afdc6b51ab1
parent09da8a27cbf61c447c7919975af9508e59bb2409
Merge branch 'master' into next