[Commit-gnuradio] [gnuradio] 32/43: 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 ca1060319c607e500f8d0efc2bb30df9575c8f38
Merge: 7fe6115 096f87e
Author: Johnathan Corgan <address@hidden>
Date:   Thu Apr 2 10:56:30 2015 -0700

    Merge branch 'maint'
    
    Conflicts:
        volk

 grc/gui/Connection.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)