[Commit-gnuradio] [gnuradio] 06/07: 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 b43c396c9cc2733041a1433f287735a2df48be82
Merge: fdfece1 e61a5c8
Author: Johnathan Corgan <address@hidden>
Date:   Tue Apr 21 19:53:16 2015 -0700

    Merge branch 'maint'

 gnuradio-runtime/lib/pmt/unv_template.cc.t | 3 +--
 gr-blocks/lib/message_strobe_impl.cc       | 3 +++
 2 files changed, 4 insertions(+), 2 deletions(-)