[Commit-gnuradio] [gnuradio] 09/10: 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 a80edf4570d75f1325dce7e026e166956bb1db5f
Merge: 6c7e4bf 1ff0e74
Author: Johnathan Corgan <address@hidden>
Date:   Sun Jun 14 09:18:48 2015 -0700

    Merge branch 'maint'

 grc/base/Connection.py  |  2 +-
 grc/base/ParseXML.py    | 31 ++++++++++++++++++-------------
 grc/gui/PropsDialog.py  |  7 +++++--
 grc/python/Generator.py |  2 +-
 4 files changed, 25 insertions(+), 17 deletions(-)