[Commit-gnuradio] [gnuradio] 36/37: 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 07b9a873398f055e688ae058085fe2646e659856
Merge: 2bb2b31 b4ddba7
Author: Tom Rondeau <address@hidden>
Date:   Tue Jul 15 17:11:37 2014 -0400

    Merge branch 'maint'

 gnuradio-runtime/include/gnuradio/rpcregisterhelpers.h | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)