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

[Daniel Vrátil]

commit 5dfe64a53d5ddbb553a0f542e6dced00312bb12a
Merge: c1976cc b302cde
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Mon Feb 16 14:26:21 2015 +0100

    Merge branch 'master' into f21

 .gitignore |    1 +
 sources    |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)
---