[mingw-qt5-qttools/epel7: 3/3] Merge branch 'master' into epel7

[Erik van Pienbroek]

commit 562683187402bd689c7f1a327dbe73ed2adec47f
Merge: 367311c e1c1fde
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Sat Sep 20 20:37:47 2014 +0200

    Merge branch 'master' into epel7

 .gitignore             |    1 +
 mingw-qt5-qttools.spec |    8 +++++++-
 sources                |    2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)
---