[Commit-gnuradio] [gnuradio] 03/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 7cbd94faf2463735f4826498120883095b767aed
Merge: 6cf003d 25ece67
Author: Johnathan Corgan <address@hidden>
Date:   Wed Aug 5 13:21:04 2015 -0700

    Merge branch 'maint'

 gnuradio-runtime/lib/buffer.cc | 37 +++++++++++++++++++++++++++++++------
 1 file changed, 31 insertions(+), 6 deletions(-)