[kf5-kimageformats/f21: 3/3] Merge branch 'master' into f21

[Daniel Vrátil]

commit 13b74564e4a5b608d041769a88fd9286ed1b6526
Merge: 5dfe64a d6380ea
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Mon Mar 16 12:51:18 2015 +0100

    Merge branch 'master' into f21

 .gitignore             | 1 +
 kf5-kimageformats.spec | 8 +++++++-
 sources                | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)
---