From: Ian Delaney <idella4@gentoo.org>
Date: Sun, 10 Jan 2016 11:40:57 +0000 (+0800)
Subject: Merge remote-tracking branch 'remotes/mjeveritt/sstp2'
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1514f15f3e03cbfd2e604eeeca2390368036d388;p=gentoo.git

Merge remote-tracking branch 'remotes/mjeveritt/sstp2'

Pull request: https://github.com/gentoo/gentoo/pull/631
---

1514f15f3e03cbfd2e604eeeca2390368036d388