Merge remote-tracking branch 'remotes/mjeveritt/sstp2'
authorIan Delaney <idella4@gentoo.org>
Sun, 10 Jan 2016 11:40:57 +0000 (19:40 +0800)
committerIan Delaney <idella4@gentoo.org>
Sun, 10 Jan 2016 11:40:57 +0000 (19:40 +0800)
Pull request: https://github.com/gentoo/gentoo/pull/631


Trivial merge