[Commit-gnuradio] [gnuradio] 03/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 6e3fbfd50f338932a20edbca3ba4d08e004198b5
Merge: cd7918a e4873df
Author: Johnathan Corgan <address@hidden>
Date:   Mon Nov 3 10:35:24 2014 -0800

    Merge branch 'maint'

 .../lib/correlate_access_code_tag_bb_impl.cc       |  5 +-
 .../python/digital/qa_correlate_access_code_tag.py | 80 ++++++++++++++++++++++
 grc/python/Generator.py                            |  6 +-
 grc/python/flow_graph.tmpl                         |  5 +-
 4 files changed, 91 insertions(+), 5 deletions(-)