Merge branch 'master' of git+ssh://git.gentoo.org/repo/gentoo
authorIan Delaney <idella4@gentoo.org>
Mon, 10 Aug 2015 03:11:44 +0000 (11:11 +0800)
committerIan Delaney <idella4@gentoo.org>
Mon, 10 Aug 2015 03:11:44 +0000 (11:11 +0800)
commitffa88f42fec5f07fa009debe1e0eb3e89321e337
tree468134936e8da4f67a297e5aa8fc6f84ea2845f4
parenta11ee91fc0b135a50c9230007d6ca1468eab8a0b
parent8ac4567328425134b26ce81c907442b8923751c3
Merge branch 'master' of git+ssh://git.gentoo.org/repo/gentoo