[Commit-gnuradio] [gnuradio] 05/08: 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 86353a4b956d53703014efcf0b0da9606cea6b29
Merge: 6168622 3cf1d10
Author: Johnathan Corgan <address@hidden>
Date:   Wed Apr 1 05:37:44 2015 -0700

    Merge branch 'maint'
    
    Conflicts:
        volk

 gr-digital/lib/clock_recovery_mm_cc_impl.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)