[Commit-gnuradio] [gnuradio] 03/03: Merge remote-tracking branch 'osh/zmq_fix'

[git]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch master
in repository gnuradio.

commit a8a8f45e070b2d0bd2dc678c9bee5494e051544f
Merge: edec5c7 2d4940d
Author: Johnathan Corgan <address@hidden>
Date:   Mon Feb 9 09:24:02 2015 -0800

    Merge remote-tracking branch 'osh/zmq_fix'

 gr-zeromq/lib/pub_sink_impl.cc  | 14 ++++++++++----
 gr-zeromq/lib/push_sink_impl.cc | 13 +++++++++----
 gr-zeromq/lib/rep_sink_impl.cc  | 13 ++++++++++---
 3 files changed, 29 insertions(+), 11 deletions(-)