[kf5-kimageformats/f20: 2/2] Merge branch 'master' into f20

[Daniel Vrátil]

commit 747c684582823677477fbf8c1ecba621c554627f
Merge: e20071d 43410d5
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Mon Feb 16 13:13:00 2015 +0100

    Merge branch 'master' into f20

 kf5-kimageformats.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---