[Commit-gnuradio] [gnuradio] 05/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 a0794d50e2642e7cd651c450ba326b2c8ae7114f
Merge: cf1ddf6 7130365
Author: Johnathan Corgan <address@hidden>
Date:   Mon Jul 6 15:37:59 2015 -0700

    Merge branch 'maint'

 gnuradio-runtime/include/gnuradio/flowgraph.h | 76 +++++++++++++++++++++------
 1 file changed, 61 insertions(+), 15 deletions(-)