]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Wed, 11 Jul 2012 17:06:21 +0000 (19:06 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Wed, 11 Jul 2012 17:06:21 +0000 (19:06 +0200)
commit2e6206373ce15c65b25644ff3e63a5314279b4c0
tree9d810ff3949ea5df4dd64fd9fe766dea77a321cb
parentb9e6d37efb3ae3c55305ee334fd2b0fa7dec14df
parentf989467184dcdf7abd60d3a3355fa26b9aa5c773
Merge branch 'master' into next