[qt5-qttools/f21: 21/21] Merge branch 'master' into f21

[Rex Dieter]

commit 5e14dd002365aad64c5e59ec551a353b24445bed
Merge: 16635c3 bfce310
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Dec 11 06:49:01 2014 -0600

    Merge branch 'master' into f21

 .gitignore                                         |    2 +-
 qdbusviewer.desktop                                |    2 +-
 qt5-qttools.spec                                   |  187 +++++++++++++++-----
 ...tools-opensource-src-5.3.2-system-clucene.patch |  108 +++++++-----
 sources                                            |    2 +-
 5 files changed, 215 insertions(+), 86 deletions(-)
---