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

[Erik van Pienbroek]

commit 54cf69a7d79da1a5982760d100ebde7e245fa941
Merge: 656a1b6 52e4f70
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Wed Dec 31 11:49:25 2014 +0100

    Merge branch 'master' into epel7

 mingw-qt5-qtbase.spec |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)
---