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

[Daniel Vrátil]

commit 4338d529f716630bae7a864c37001a75a2c54c78
Merge: ee272b8 b26ce62
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Tue Oct 7 13:21:02 2014 +0200

    Merge branch 'master' into f20

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