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

[Daniel Vrátil]

commit e20071d1d827494d94ae82ed872beabce6074488
Merge: c21bb18 31f0baf
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Thu Jan 8 16:04:49 2015 +0100

    Merge branch 'master' into f20
    
    Conflicts:
    	.gitignore
    	kf5-kimageformats.spec
    	sources

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