[Commit-gnuradio] [gnuradio] 07/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 1185d401caf8f420b93754398675d012f08ef68f
Merge: e1e4cc4 1b9c8ab
Author: Johnathan Corgan <address@hidden>
Date:   Mon Jul 6 16:04:32 2015 -0700

    Merge branch 'maint'

 grc/gui/BlockTreeWindow.py     | 2 +-
 grc/scripts/gnuradio-companion | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)