[Commit-gnuradio] [gnuradio] 13/17: Merge remote-tracking branch 'balint/3.7-1/tcp_connection_mtu_no_delay'

[git]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 31049cea81da56232a56368679f6a404aa641917
Merge: 3eb41df c20fdf5
Author: Johnathan Corgan <address@hidden>
Date:   Mon Mar 31 11:51:29 2014 -0700

    Merge remote-tracking branch 'balint/3.7-1/tcp_connection_mtu_no_delay'

 gr-blocks/lib/tcp_connection.cc | 50 ++++++++++++++++++++++++++---------------
 gr-blocks/lib/tcp_connection.h  |  8 +++----
 2 files changed, 36 insertions(+), 22 deletions(-)