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

[Daniel Vrátil]

commit 01552c9ee8f3c34fdea10b5d12b1031479251dd2
Merge: 4685891 12e98e6
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Mon Feb 16 13:13:03 2015 +0100

    Merge branch 'master' into f20

 .gitignore       |    1 +
 kf5-kwallet.spec |   19 +++++++++----------
 sources          |    2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)
---