[Commit-gnuradio] [gnuradio] 09/10: Merge remote-tracking branch 'mhostetter/master'

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit a6fa4d159690f455ad2a1e0c98adceb16c64462e
Merge: 99c3de6 466877f
Author: Johnathan Corgan <address@hidden>
Date:   Thu Apr 14 12:53:56 2016 -0700

    Merge remote-tracking branch 'mhostetter/master'

 gr-utils/python/modtool/gr-newmod/CMakeLists.txt | 6 ++++++
 1 file changed, 6 insertions(+)