]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sun, 8 Jan 2012 12:30:41 +0000 (12:30 +0000)
committerMichael Stapelberg <michael@stapelberg.de>
Sun, 8 Jan 2012 12:30:41 +0000 (12:30 +0000)
commitf88c77945744565c1b637d8fcaab271312bf1a1c
treecef81f5f88bf71be539a26bb8387ff4561805193
parentd662ba3c0c0537a33244f6a8c7298d38bfc8e19a
parentaf73d3bffed2757ff8740eff474b03d67c39a774
Merge branch 'master' into next