[Commit-gnuradio] [gnuradio] 07/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 842d8c9d9aac5f7a48a78a9d6babc865570b81c8
Merge: 7926c2b 3897c85
Author: Tom Rondeau <address@hidden>
Date:   Thu Aug 14 11:22:08 2014 -0400

    Merge branch 'maint'

 gr-blocks/include/gnuradio/blocks/delay.h | 14 ++++++++++++--
 gr-blocks/lib/delay_impl.cc               |  3 +++
 2 files changed, 15 insertions(+), 2 deletions(-)