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

[Erik van Pienbroek]

commit 367311c277f484328b55ddbcc01480a449cfd730
Merge: 4a257d8 99a35e7
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Tue Jul 8 23:38:05 2014 +0200

    Merge branch 'master' into epel7

 .gitignore                                     |    1 +
 82d7e1d3b4b860911ff9c784cb22e9e47d0efb2e.patch |   31 ------------------------
 mingw-qt5-qttools.spec                         |   11 ++++----
 sources                                        |    2 +-
 4 files changed, 7 insertions(+), 38 deletions(-)
---