Merge branch 'master' of git+ssh://git.gentoo.org/repo/gentoo
authorAaron W. Swenson <titanofold@gentoo.org>
Wed, 9 Dec 2015 12:44:49 +0000 (07:44 -0500)
committerAaron W. Swenson <titanofold@gentoo.org>
Wed, 9 Dec 2015 12:51:42 +0000 (07:51 -0500)
commit0d8a9523b9092a2065a3d65f95e109d17d332cec
treea8b72e03592c62256e75b5bf4f6778e1ffea78b8
parentc20f39cdcba8d3f75fcd7d6c09e80d2ee0655e40
parent8ec0e33e70a40f62dc1a3fc7a6620858963f6bb6
Merge branch 'master' of git+ssh://git.gentoo.org/repo/gentoo