]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Wed, 15 Feb 2012 22:05:28 +0000 (22:05 +0000)
committerMichael Stapelberg <michael@stapelberg.de>
Wed, 15 Feb 2012 22:05:28 +0000 (22:05 +0000)
commit5edacf49435023ab5a876d3425693ea530872918
treeb83dce7f15efe1fd5c92ad6d7d099347e9838e38
parent3827d3758c2b5150c8eeb0eaa2d5759fbbcdb77c
parent47c2f29fc0777d7950c212fe98c561a5429b6a5d
Merge branch 'master' into next