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

[Erik van Pienbroek]

commit 4175e2f484fb07f8fe85e35f4cb9035393020c7b
Merge: 5626831 c683c21
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Thu Jan 1 02:10:11 2015 +0100

    Merge branch 'master' into epel7

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