]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Wed, 9 Oct 2013 17:49:48 +0000 (19:49 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Wed, 9 Oct 2013 17:49:48 +0000 (19:49 +0200)
commita09a5c391ea3bf350b966b65c6dfd2fcc017c88b
tree8fbd7dbe7396a6cdaf522384c9d12ab3dfc15d7a
parentd661c1493c9218f48fee9b0fc71bc2006d55a3e2
parentcf7ea276ba418e9ae7fd79a1f0c71f8b9302a864
Merge branch 'master' into next