[kf5-kdelibs4support/f20: 3/3] Merge branch 'master' into f20

[Daniel Vrátil]

commit c4a3edf27f978b06a74d2ad6797a4e10bc14916d
Merge: 92e98cb eb354e4
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Mon Feb 16 13:13:04 2015 +0100

    Merge branch 'master' into f20

 .gitignore               |    1 +
 kf5-kdelibs4support.spec |   14 ++++++++++----
 sources                  |    2 +-
 3 files changed, 12 insertions(+), 5 deletions(-)
---