[Commit-gnuradio] [gnuradio] 05/06: 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 c2fe4ec6466d9f1a1d45ad7adb923630d0770865
Merge: 8e1e920 3bff8fa
Author: Johnathan Corgan <address@hidden>
Date:   Mon Jun 22 07:24:07 2015 -0700

    Merge branch 'maint'

 grc/gui/Dialogs.py     | 18 ++++++++++++++----
 grc/gui/PropsDialog.py |  6 +++---
 grc/python/Block.py    |  3 ++-
 3 files changed, 19 insertions(+), 8 deletions(-)