[Commit-gnuradio] [gnuradio] 13/16: 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 855c3d5e1cdfeb3a2d13d95527a48eb6c5036b5d
Merge: ecc72d2 a42b7dc
Author: Johnathan Corgan <address@hidden>
Date:   Sat Oct 3 11:08:01 2015 -0700

    Merge branch 'maint'

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