[Commit-gnuradio] [gnuradio] 10/10: Merge remote-tracking branch 'gnuradio-wg-grc/maint_grcwg' into maint

[git]

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

jcorgan pushed a commit to branch maint
in repository gnuradio.

commit 4aa94044e721f1a4fbff75f5bfb32c5adb5691ea
Merge: 1db085e c4a7a9a
Author: Johnathan Corgan <address@hidden>
Date:   Mon Apr 25 15:42:30 2016 -0700

    Merge remote-tracking branch 'gnuradio-wg-grc/maint_grcwg' into maint

 grc/gui/Bars.py        | 4 ++--
 grc/python/Platform.py | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)