]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Tue, 9 Aug 2011 08:02:55 +0000 (10:02 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Tue, 9 Aug 2011 08:02:55 +0000 (10:02 +0200)
commit016ecb65fbbe8b1846ce1d2789ddc3db746b20de
treef4436c1fa01fe19eb32589c8dc385335c4885991
parentf8d834c62d6b5ce89e13824bc29f6c9416edc223
parent6b1dce27f72564e931747067c44d3d1b8ea4ba5d
Merge branch 'master' into next