]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sun, 10 Jun 2012 16:23:26 +0000 (18:23 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Sun, 10 Jun 2012 16:23:26 +0000 (18:23 +0200)
commitcf91dc676adf1303379587696803d93802ade5c6
tree44b0c913257442ce135f51500ac01894f861f815
parentbb167f6bed66ac09cfb5cd6667ec2c4846291ad0
parent5e735744ce3b9d722ace1346da1c15c78d140b2f
Merge branch 'master' into next