]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Fri, 27 Jan 2012 19:56:58 +0000 (19:56 +0000)
committerMichael Stapelberg <michael@stapelberg.de>
Fri, 27 Jan 2012 19:56:58 +0000 (19:56 +0000)
commitcc2fda92422e29a61c929ffde8d3199305b89946
treea2dcfb704844a4b864724bf4aa95f427b9ebaeb3
parentc7ea8c42b679be191e843f653f5024846ce42fe9
parent536580fe7328db310d630d823365f5781412bfd4
Merge branch 'master' into next

Conflicts:
debian/changelog
debian/changelog