[Commit-gnuradio] [gnuradio] 11/13: Merge remote-tracking branch 'mmueller/socket_pdu_fix_resolver_issue'

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit f281fb9d18192cf878f40b2e77501822e093d0a5
Merge: c47f200 e1d838e
Author: Johnathan Corgan <address@hidden>
Date:   Tue Apr 15 16:47:12 2014 -0700

    Merge remote-tracking branch 'mmueller/socket_pdu_fix_resolver_issue'

 gr-blocks/lib/socket_pdu_impl.cc | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)