[Commit-gnuradio] [gnuradio] 05/05: 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 687c637fd80a926fb13ef5285991e4fdee50bd1b
Merge: c9f6464 a590a37
Author: Johnathan Corgan <address@hidden>
Date:   Mon Oct 13 13:10:56 2014 -0700

    Merge branch 'maint'

 gr-fec/python/fec/qa_ber_bf.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)