[Commit-gnuradio] [gnuradio] 06/09: Merge remote-tracking branch 'nowls/master'

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 2c2dc2a29f680d188c574a392a189d0297c07cf7
Merge: b33345b 2233907
Author: Johnathan Corgan <address@hidden>
Date:   Wed Feb 4 12:50:23 2015 -0800

    Merge remote-tracking branch 'nowls/master'

 gr-digital/lib/fll_band_edge_cc_impl.cc | 2 ++
 1 file changed, 2 insertions(+)