[Commit-gnuradio] [gnuradio] 13/18: 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 86d551e04181f6b6c2a039695ab73eb289e87c17
Merge: d55fde3 c04bef9
Author: Johnathan Corgan <address@hidden>
Date:   Mon Dec 7 13:41:30 2015 -0800

    Merge branch 'maint'

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