[Commit-gnuradio] [gnuradio] 02/20: Merge branch 'maint_grcwg' into master_grcwg

[git]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch master
in repository gnuradio.

commit de1defc961697ae94e268eacecb99c31bc25e42a
Merge: 22e2f1a 3a2cdbc
Author: Sebastian Koslowski <address@hidden>
Date:   Wed Aug 12 14:10:48 2015 +0200

    Merge branch 'maint_grcwg' into master_grcwg

 grc/python/Generator.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)