[gnuradio/f21: 3/3] Merge remote-tracking branch 'origin/master' into f21

[Jaroslav Škarvada]

commit 4e13a3abf113cc24a4323ae51f36317ca93f4ca4
Merge: 44422d4 a838bd3
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date:   Wed Oct 22 00:39:42 2014 +0200

    Merge remote-tracking branch 'origin/master' into f21

 gnuradio.spec |    8 ++++++--
 sources       |    2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)
---