[Commit-gnuradio] [gnuradio] 13/14: 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 9105d62ee3d1197cfe1fc3bcc309ee3d451cf5fc
Merge: 5f19a86 e632568
Author: Johnathan Corgan <address@hidden>
Date:   Fri May 9 14:16:14 2014 -0700

    Merge branch 'maint'

 grc/blocks/variable_function_probe.xml | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)