]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sun, 7 Apr 2013 08:00:42 +0000 (10:00 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Sun, 7 Apr 2013 08:00:42 +0000 (10:00 +0200)
commitbb22e232ad2e2ae6289e907ece0afe5c66faa23c
tree41441fb3bfb63677933003cdd48d9c6e06b2400d
parent114d7bf2625df290c6508de20aa4e08c21a146fe
parentcd001a49f6cb01ca4e88dd4e050e2121b7e17e6c
Merge branch 'master' into next