]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Wed, 3 Aug 2011 22:11:00 +0000 (00:11 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Wed, 3 Aug 2011 22:11:00 +0000 (00:11 +0200)
commit2e0f5335f45c1b698e62627db3a63862b1281efd
tree135f1e5fd3434dba6af6df21c72a6a3e5ddaf0e2
parent4c3a8957eec8662cbce68673abbe31d23475fca9
parent8287a9429295678694f57b55f9b8c633aa60d5c7
Merge branch 'master' into next