Merge branch 'master' of git+ssh://git.gentoo.org/repo/gentoo
authorAndreas K. Huettel (dilfridge) <dilfridge@gentoo.org>
Sat, 10 Oct 2015 09:30:20 +0000 (11:30 +0200)
committerAndreas K. Huettel (dilfridge) <dilfridge@gentoo.org>
Sat, 10 Oct 2015 09:30:20 +0000 (11:30 +0200)

Trivial merge