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

[Rex Dieter]

commit 54f3f95eac708229544fc8bac775fb720b4be180
Merge: b74c84c 9298b7a
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 23:19:39 2014 -0500

    Merge branch 'master' into f20

 .gitignore          |    7 ++++++-
 kwalletmanager.spec |   25 +++++++++++++++++++++++--
 sources             |    2 +-
 3 files changed, 30 insertions(+), 4 deletions(-)
---