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

[Erik van Pienbroek]

commit 2d5990fea44ecde0b1f395dac5723b1dfd954141
Merge: 54cf69a 8f96dc9
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Wed Dec 31 13:31:21 2014 +0100

    Merge branch 'master' into epel7

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