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

[Daniel Vrátil]

commit c1976cc725a67cec8838d21c82e130296ca07013
Merge: 070a6c0 43410d5
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Mon Feb 16 13:12:58 2015 +0100

    Merge branch 'master' into f21

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