[Commit-gnuradio] [gnuradio] 12/13: 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 474f88abe17c873c78cedcda28b4d321eafeebbd
Merge: cc973de f8a9f9f
Author: Johnathan Corgan <address@hidden>
Date:   Fri Jul 24 08:18:40 2015 -0700

    Merge branch 'maint'

 cmake/Modules/FindGSL.cmake               | 11 +++---
 gnuradio-runtime/lib/pmt/pmt_serialize.cc |  2 +-
 grc/gui/Utils.py                          | 57 +++++++++++++++++--------------
 volk                                      |  2 +-
 4 files changed, 41 insertions(+), 31 deletions(-)