[mingw-crt/epel7: 5/5] Merge branch 'master' into epel7

[Erik van Pienbroek]

commit a35cbd15e95a4deb54bec69eea770805d2c978a0
Merge: 934b1a4 4a30baf
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Wed Dec 31 00:11:52 2014 +0100

    Merge branch 'master' into epel7

 .gitignore     |    4 ++++
 mingw-crt.spec |   26 +++++++++++++++++---------
 sources        |    2 +-
 3 files changed, 22 insertions(+), 10 deletions(-)
---