]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Wed, 24 Aug 2011 22:24:12 +0000 (00:24 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Wed, 24 Aug 2011 22:24:12 +0000 (00:24 +0200)
commit4fcca74e2b2752b2c0fb2ea972374b3f3f70dd7d
treea72b3bfe96036c98e093e0e306952e97de0f5880
parent2acbf4d4a42e2c0eacb734463b64bba8f95103ad
parent1d6e41e49320c02e402a24f266ce84e97dba8480
Merge branch 'master' into next