[Commit-gnuradio] [gnuradio] 04/05: 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 df44f1febb1954f0498b74a6f0f0e61b839142fc
Merge: 26de50e 2e77960
Author: Johnathan Corgan <address@hidden>
Date:   Wed Apr 27 16:59:21 2016 -0700

    Merge branch 'maint'

 gr-blocks/examples/CMakeLists.txt           |    1 +
 gr-blocks/examples/test_stream_mux_tags.grc | 1289 +++++++++++++++++++++++++++
 gr-blocks/lib/stream_mux_impl.cc            |    8 +
 gr-blocks/python/blocks/qa_stream_mux.py    |   60 +-
 4 files changed, 1357 insertions(+), 1 deletion(-)