[uhd/f21: 2/2] Merge remote-tracking branch 'origin/master' into f21

[Jaroslav Škarvada]

commit ade34bb0532d60ccacb61db38019522f70808cc4
Merge: 03767ce b8e2bc8
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date:   Mon Sep 1 17:18:06 2014 +0200

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

 uhd.spec |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---