[Commit-gnuradio] [gnuradio] 06/07: Merge remote-tracking branch 'smunaut/grc-xinitthreads-fix'

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit ff622ae57194d3fd889f5b772e7285eeb8606443
Merge: f1e7ee4 b5299f0
Author: Johnathan Corgan <address@hidden>
Date:   Tue Jan 13 13:35:55 2015 -0800

    Merge remote-tracking branch 'smunaut/grc-xinitthreads-fix'

 grc/python/flow_graph.tmpl | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)