[qt5-qtimageformats/f21: 5/5] Merge branch 'master' into f21

[Rex Dieter]

commit 1fc7748f48fb81a10c51b8035fc8d1ae0ed41d5b
Merge: 30d17e8 9f21c2d
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Dec 11 10:15:16 2014 -0600

    Merge branch 'master' into f21

 .gitignore                                         |    2 +-
 qt5-qtimageformats.spec                            |   39 ++++++++++++++------
 ...eformats-opensource-src-5.2.1-libmng-test.patch |   11 ------
 sources                                            |    2 +-
 4 files changed, 30 insertions(+), 24 deletions(-)
---