[Commit-gnuradio] [gnuradio] 08/08: Merge branch 'maint'

[git]

This is an automated email from the git hooks/post-receive script.

trondeau pushed a commit to branch master
in repository gnuradio.

commit ca69ec5d64b67dfc714917bd94162a5d1f131d69
Merge: 0b5950d 8fbba12
Author: Tom Rondeau <address@hidden>
Date:   Thu Mar 6 14:48:44 2014 -0500

    Merge branch 'maint'

 gr-digital/lib/fll_band_edge_cc_impl.cc | 43 ++++++++++++---------------------
 gr-digital/lib/fll_band_edge_cc_impl.h  | 20 +++++++--------
 2 files changed, 25 insertions(+), 38 deletions(-)