[qt5-qtquickcontrols/f20: 3/4] Merge branch 'master' into f20

[Rex Dieter]

commit 06dba908eef93674db95f220811f71dfa2bba108
Merge: 1a44b51 7019df2
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Oct 24 20:14:34 2013 -0500

    Merge branch 'master' into f20

 qt5-qtquickcontrols.spec |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)
---