Merge pull request #3560 from julbrygd/for-15.05
authorTed Hess <thess@kitschensync.net>
Fri, 25 Nov 2016 13:50:21 +0000 (08:50 -0500)
committerGitHub <noreply@github.com>
Fri, 25 Nov 2016 13:50:21 +0000 (08:50 -0500)
commit5515c732ce8a5bed0aaa83d45c32a2097a9d5766
tree2209a71a9c506e7608ef0a40526293f60550f43b
parent88ee2a03efcc87211affc1c1ccd14340b4755130
parent7e15eb3cffe224b91904049a3ec63fec2abe73d6
Merge pull request #3560 from julbrygd/for-15.05

libsodium and dnscrypt-proxy url change for 15.05