Merge remote-tracking branch 'github/pr/331'
authorJulian Ospald <hasufell@gentoo.org>
Sat, 7 Nov 2015 20:24:36 +0000 (21:24 +0100)
committerJulian Ospald <hasufell@gentoo.org>
Sat, 7 Nov 2015 20:24:36 +0000 (21:24 +0100)

Trivial merge