Improved doc/Makefile.am generation (fixed issue in edgenet/drops)
Merge pull request #317 from hintjens/master

Improved doc/Makefile.am generation (fixed issue in edgenet/drops)
fixes MacOSX 'can't find libzmq' when installed on /usr/local/lib, by copying a configure block from jzmq ;)
Merge pull request #320 from davipt/master

fixes MacOSX 'can't find libzmq' when installed on /usr/local/lib, by co...
Merge branch 'master' of https://github.com/zeromq/czmq into cancel_timer_by_id
fix selftest, return lcrypto