]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sun, 7 Aug 2011 18:45:20 +0000 (20:45 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Sun, 7 Aug 2011 18:45:20 +0000 (20:45 +0200)
commite3049028744c66c23e4db964e5ad7d0f08c86bb7
tree94c7bd45efd6f8f8cf2edfdbb71803aab956c07d
parent8b9ba5fd0ba351a26e2bf552dd5e55a9d9ca3b74
parent6fb5d6e3135a970a72c804128b7bcc8b679ec75b
Merge branch 'master' into next