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)
commit1514f15f3e03cbfd2e604eeeca2390368036d388
tree1a7a9266f2a9121c16b87dfd4d6744f3b45609fd
parent84577da7e7f1fdc4b3e6c5246b0dad09a481b674
parent57894823441934f5ff111496d91ce2e2856b032b
Merge remote-tracking branch 'remotes/mjeveritt/sstp2'

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