[kwallet/f20: 11/11] Merge branch 'master' into f20

[Rex Dieter]

commit 65bb7ecd9109abd75e4db4e30d70dc150d97c3f3
Merge: 4264aaf f01c667
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Feb 3 11:59:30 2014 -0600

    Merge branch 'master' into f20

 .gitignore   |    6 ++++++
 kwallet.spec |   25 ++++++++++++++++++++++++-
 sources      |    2 +-
 3 files changed, 31 insertions(+), 2 deletions(-)
---