[Commit-gnuradio] [gnuradio] 24/25: Merge remote-tracking branch 'gnuradio-wg-grc/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 ffbd9d9c6c9d8c122d90462a96fc0f0f92a3c2b8
Merge: cfa67cb 8586a1f
Author: Johnathan Corgan <address@hidden>
Date:   Wed Sep 23 07:25:00 2015 -0700

    Merge remote-tracking branch 'gnuradio-wg-grc/master_grcwg'

 grc/scripts/gnuradio-companion | 64 ++++++++++++++++++++++--------------------
 1 file changed, 33 insertions(+), 31 deletions(-)