[Commit-gnuradio] [gnuradio] 04/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 61f1cf0f88db4b3471fe3d53eaf850eb68af9c35
Merge: 67463e7 5b34e51
Author: Johnathan Corgan <address@hidden>
Date:   Wed May 27 09:36:25 2015 -0700

    Merge branch 'maint'

 gr-utils/python/modtool/util_functions.py | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)