Merge branch 'master' of git+ssh://git.gentoo.org/repo/gentoo
authorMagnus Granberg <zorry@gentoo.org>
Mon, 12 Oct 2015 18:36:55 +0000 (20:36 +0200)
committerMagnus Granberg <zorry@gentoo.org>
Mon, 12 Oct 2015 18:36:55 +0000 (20:36 +0200)

Trivial merge