[Commit-gnuradio] [gnuradio] 20/21: 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 6f1263e3f3fe5042404b2c0e6b2cc9a9c6280234
Merge: 98c4425 efcae05
Author: Johnathan Corgan <address@hidden>
Date:   Fri Oct 30 13:45:38 2015 -0700

    Merge branch 'maint'
    
    Used merge strategy -s ours to keep master branch version of 
ber_curve_gen.grc
    from being overwritten by bug-fixed maint version of same.