[Commit-gnuradio] [gnuradio] 20/23: Merge remote-tracking branch 'jdemel/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 f9694561dc47749bd1d64a00e94a62fc5f23f692
Merge: 423495b c22b3ec
Author: Johnathan Corgan <address@hidden>
Date:   Sat Nov 28 12:25:13 2015 -0800

    Merge remote-tracking branch 'jdemel/maint'

 gnuradio-runtime/lib/block.cc | 7 +++++++
 1 file changed, 7 insertions(+)