[Commit-gnuradio] [gnuradio] 05/07: 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 f41dd8c3e10c3ca3228115c8e0b149626850fec1
Merge: 0bd6bf9 7ce93ff
Author: Tom Rondeau <address@hidden>
Date:   Mon Apr 21 09:10:12 2014 -0400

    Merge branch 'maint'

 gr-digital/lib/pfb_clock_sync_ccf_impl.cc | 7 +++++--
 gr-digital/lib/pfb_clock_sync_fff_impl.cc | 5 ++++-
 2 files changed, 9 insertions(+), 3 deletions(-)