]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sun, 10 Jun 2012 16:25:14 +0000 (18:25 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Sun, 10 Jun 2012 16:25:14 +0000 (18:25 +0200)
commit3f37458b7cca67e01819d622567aedf35331d73e
tree2e9d84d4a21f877295856c77ec473dfbccef65a5
parentcf91dc676adf1303379587696803d93802ade5c6
parent21a5d4f4c1b1557317dbecd2e21d4ace75a437c7
Merge branch 'master' into next