]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Tue, 9 Aug 2011 07:47:10 +0000 (09:47 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Tue, 9 Aug 2011 07:47:10 +0000 (09:47 +0200)
commitf8d834c62d6b5ce89e13824bc29f6c9416edc223
tree06d6e82b7cf7e787baa12be01086e095d0f79731
parent639a4baf7b6ba8e11de9eb287aee46da1f485092
parent042b10e0681e5274f81fdaf0d25eb1aa5c145a78
Merge branch 'master' into next