[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 82779dce49e149d9cb5acc4d77937cda59e676bd
Merge: 6f1913b beae08b
Author: Tom Rondeau <address@hidden>
Date:   Thu Oct 23 18:02:12 2014 -0400

    Merge branch 'maint'

 gr-blocks/lib/multiply_matrix_cc_impl.cc | 2 +-
 gr-blocks/lib/multiply_matrix_ff_impl.cc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)