]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sat, 6 Aug 2011 16:54:50 +0000 (18:54 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Sat, 6 Aug 2011 16:54:50 +0000 (18:54 +0200)
commit94ba65579494b6780702b1a724c5befa6e0f5a13
tree5cb72f7a14fd3ab4a6c1c87fd6dcd6c10ec75dfc
parent2631ad4c07e4fc3bb4b45c8be0947071c7ac7fa9
parent865c193971d7115051c49b60e46ecb2f7afac091
Merge branch 'master' into next