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

[Daniel Vrátil]

commit d51b287e9f637e237f24c579b22d8b59953d2f77
Merge: dd5aedd 42fc5c2
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Tue Nov 4 13:16:42 2014 +0100

    Merge branch 'master' into f20

 .gitignore               |    1 +
 kf5-kdelibs4support.spec |   74 +++++++++++++++++++++++++++++++++-------------
 sources                  |    2 +-
 3 files changed, 55 insertions(+), 22 deletions(-)
---