Fixed bad backslashes in project generation templates
Fixed doc/Makefile.am generation for private classes
Merge pull request #315 from hintjens/master

Fixed bad backslashes in project generation templates
Fixed issue #312
Merge pull request #316 from hintjens/master

Fixed issue #312
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)
cancel timers by identifier
Link in libuuid
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
Merge pull request #318 from claws/cancel_timer_by_id

cancel timers by identifier
Fixed #322
Additional files for issue #322
Fixed #325

- zcert_new returns NULL when libsodium isn't installed
zproxy did not build with pre-4.x versions of ZeroMQ

- for versions prior to 3.2.1, use zmq_device instead of zmq_proxy
- does not implement capture socket on these older versions
zproxy fix for older versions was not working

- selftest did not work properly with zmq_device as underlying engine
- conditional compile was using wrong macros
Merge pull request #324 from hintjens/master

Fixed #322