Merge branch 'master' of git://github.com/alunduil/gentoo
authorJulian Ospald <hasufell@gentoo.org>
Tue, 13 Oct 2015 10:44:07 +0000 (12:44 +0200)
committerJulian Ospald <hasufell@gentoo.org>
Tue, 13 Oct 2015 10:50:45 +0000 (12:50 +0200)

Trivial merge