[kwalletmanager/f20: 2/2] Merge branch 'master' into f20

[Rex Dieter]

commit 3a64559aa7a6352682425867366124df03762ec2
Merge: 54f3f95 d2c6748
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:49:14 2014 -0500

    Merge branch 'master' into f20

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