Merge pull request #1257 from thess/zmq-work
authorTed Hess <thess@kitschensync.net>
Fri, 15 May 2015 14:48:38 +0000 (10:48 -0400)
committerTed Hess <thess@kitschensync.net>
Fri, 15 May 2015 14:48:38 +0000 (10:48 -0400)
zmq: Make libsodium optional


Trivial merge