Merge commit 'refs/pull/993/head' of git://github.com/gentoo/gentoo
authorJason Zaman <perfinion@gentoo.org>
Mon, 7 Mar 2016 09:26:55 +0000 (17:26 +0800)
committerJason Zaman <perfinion@gentoo.org>
Mon, 7 Mar 2016 09:26:55 +0000 (17:26 +0800)

Trivial merge