]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Fri, 30 Aug 2013 18:01:04 +0000 (20:01 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Fri, 30 Aug 2013 18:01:04 +0000 (20:01 +0200)
commit599a4d48e61c9f4293069cdbe8aee245339b8f2d
tree1bd50c239acf9ef2b2f617c9c60d1428fd981d3d
parent1a7fe4ee79dd707d33832c672c8e1c5a5619b983
parenta68a911a3059add44be6497823a2cf15f20d09b0
Merge branch 'master' into next