[Commit-gnuradio] [gnuradio] 29/29: 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 1581681c8ad8b150c7b417eb2fef21ff27ba5942
Merge: 3183a25 65dbd67
Author: Johnathan Corgan <address@hidden>
Date:   Mon Jan 12 17:01:34 2015 -0800

    Merge branch 'maint'

 gr-filter/lib/pfb_arb_resampler.cc              | 18 +++++++++---------
 gr-filter/python/filter/qa_pfb_arb_resampler.py | 10 +++++-----
 2 files changed, 14 insertions(+), 14 deletions(-)