[Commit-gnuradio] [gnuradio] 16/20: Merge remote-tracking branch 'ckuethe/trap_import_errors'

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 0da63d881c4669511dd6d662328a4821aeb11f47
Merge: 4d6760b d7a2a2b
Author: Johnathan Corgan <address@hidden>
Date:   Fri Aug 28 11:41:48 2015 -0700

    Merge remote-tracking branch 'ckuethe/trap_import_errors'

 .../python/gnuradio/ctrlport/gr-perf-monitorx       | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)