[Commit-gnuradio] [gnuradio] 13/13: 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 83da78945f7e68da2630f7006ce319d758fdc29d
Merge: e1290cc 6bd9850
Author: Johnathan Corgan <address@hidden>
Date:   Sat Oct 17 10:19:26 2015 -0700

    Merge branch 'maint'

 gr-uhd/apps/uhd_rx_nogui | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)