]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sun, 18 Dec 2011 15:19:09 +0000 (15:19 +0000)
committerMichael Stapelberg <michael@stapelberg.de>
Sun, 18 Dec 2011 15:19:09 +0000 (15:19 +0000)
commit2ba09f54197b4bd67d9e5a79afee09919508de93
tree34c93a95a52014f31c7f2f6cadace172829c3247
parent4412ccbe5a4fad8a4cd594e6f10f937515a4d37c
parent59a694edea13ebf84031bb02dfa6b7b97cf5b5e3
Merge branch 'master' into next