[Commit-gnuradio] [gnuradio] 03/03: Merge remote-tracking branch 'mbr0wn/modtool/lang_consistency' into maint

[git]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch maint
in repository gnuradio.

commit 6efacb8e3a8dcefab94231e08827161cb8e0c737
Merge: 6720e65 050bad8
Author: Johnathan Corgan <address@hidden>
Date:   Fri May 27 11:07:30 2016 -0700

    Merge remote-tracking branch 'mbr0wn/modtool/lang_consistency' into maint
    
    # Please enter a commit message to explain why this merge is necessary,
    # especially if it merges an updated upstream into a topic branch.
    #
    # Lines starting with '#' will be ignored, and an empty message aborts
    # the commit.

 gr-utils/python/modtool/modtool_add.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)