[Commit-gnuradio] [gnuradio] 03/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 830a497aca90a1ca9a01ef1949764029a3c3e437
Merge: bdaafcc 11973c6
Author: Johnathan Corgan <address@hidden>
Date:   Wed Jan 27 13:56:01 2016 -0800

    Merge branch 'maint'

 gnuradio-runtime/include/gnuradio/sptr_magic.h |  1 +
 gnuradio-runtime/lib/hier_block2.cc            |  2 ++
 gnuradio-runtime/lib/sptr_magic.cc             | 35 +++++++++++++++++++++++++-
 3 files changed, 37 insertions(+), 1 deletion(-)