]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Fri, 27 Jan 2012 19:34:15 +0000 (19:34 +0000)
committerMichael Stapelberg <michael@stapelberg.de>
Fri, 27 Jan 2012 19:34:15 +0000 (19:34 +0000)
commitc7ea8c42b679be191e843f653f5024846ce42fe9
treef5a44a9b306e530c7f36cfbef40dade9ccba8968
parent0a50add8ccd40cd425f93db39e0d7bbee9fc8880
parent49cf36cd5973fd33c759768e150da52240c06b44
Merge branch 'master' into next

Conflicts:
debian/changelog
debian/changelog