[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 f5cb6160333ed1eb698a4477439e66a792f4efa2
Merge: c84e7f4 fd2ec0b
Author: Johnathan Corgan <address@hidden>
Date:   Sun Aug 17 14:57:48 2014 -0700

    Merge branch 'maint'

 gr-utils/python/modtool/modtool_makexml.py | 2 +-
 gr-wxgui/python/wxgui/forms/forms.py       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)