]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Wed, 17 Aug 2011 10:29:15 +0000 (12:29 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Wed, 17 Aug 2011 10:29:15 +0000 (12:29 +0200)
commit2eab8d7f2007d824de8aff6cde94d3eeb799c015
tree7d3a8a266246a8f50c53c573acff89a78663585e
parent7eacf8dd049dd2e92ae4e5e92f12f148290e81fa
parent4f0a3fd1ba41b11e8b4907745048d4be00bbed2c
Merge branch 'master' into next