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

[Erik van Pienbroek]

commit 29162047de42ceb2eed3404b7704a7c8bfc7467c
Merge: e1e645d 2955bcb
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Fri Sep 19 23:52:19 2014 +0200

    Merge branch 'master' into epel7

 .gitignore            |    1 +
 mingw-qt5-qtbase.spec |   10 ++++++++--
 sources               |    2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)
---