[Commit-gnuradio] [gnuradio] 05/11: 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 f3fbf453e08a490d6c610658ad6394e308c2a14e
Merge: 34ee3b7 c138442
Author: Johnathan Corgan <address@hidden>
Date:   Fri Jun 13 14:36:01 2014 -0700

    Merge branch 'maint'

 grc/python/FlowGraph.py    | 17 +++++++++++++++++
 grc/python/flow_graph.tmpl |  8 +++-----
 2 files changed, 20 insertions(+), 5 deletions(-)