renaming zmq.hh
renaming zmq.hh
Merge remote-tracking branch 'upstream/offline_2014_Aug_dbeck'