Merge branch 'master' of git+ssh://git.gentoo.org/repo/gentoo
authorMagnus Granberg <zorry@gentoo.org>
Mon, 12 Oct 2015 18:36:55 +0000 (20:36 +0200)
committerMagnus Granberg <zorry@gentoo.org>
Mon, 12 Oct 2015 18:36:55 +0000 (20:36 +0200)
commitb05fe7e1c75421bfbff1dc49ad4103032aba0bfa
tree8346324002447a476eca8010b84b4fedde7aadc9
parent02914d4a1d331d8fc07842d92b79cfb2cce2275e
parent77e4cb85f6781ff1bb88bc9b9033f65226673ef7
Merge branch 'master' of git+ssh://git.gentoo.org/repo/gentoo