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

[Daniel Vrátil]

commit 9db06c2cb69084d0bc8e65eebf5d1fe485413889
Merge: e5b9efd db5b1fb
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Mon Feb 16 13:13:02 2015 +0100

    Merge branch 'master' into f20

 .gitignore               |    1 +
 kf5-kdesignerplugin.spec |   24 ++++++++----------------
 sources                  |    2 +-
 3 files changed, 10 insertions(+), 17 deletions(-)
---