[Commit-gnuradio] [gnuradio] 02/03: Merge branch 'maint'

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit ce73fbf0986c1e66c83f37b92c3b61d1c9813d60
Merge: b1883cb 5ac4940
Author: Johnathan Corgan <address@hidden>
Date:   Tue Oct 13 19:03:40 2015 -0700

    Merge branch 'maint'

 gr-blocks/lib/socket_pdu_impl.cc         |  17 +++++
 gr-blocks/lib/socket_pdu_impl.h          |   7 ++-
 gr-blocks/python/blocks/qa_socket_pdu.py | 105 +++++++++++++++++++++++++++++++
 grc/gui/Block.py                         |   4 +-
 4 files changed, 130 insertions(+), 3 deletions(-)