[qt5-qtimageformats/f21: 2/2] Merge branch 'f22' into f21

[Jan Grulich]

commit 824f55813ba3bc8c3ece7064c625c5d01939a125
Merge: 1fc7748 1ee517f
Author: Jan Grulich <jgrulich at redhat.com>
Date:   Wed Feb 25 09:40:23 2015 +0100

    Merge branch 'f22' into f21

 .gitignore              | 1 +
 qt5-qtimageformats.spec | 5 ++++-
 sources                 | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---