[mate-keyring/f18: 4/4] git merge f19

[Wolfgang Ulbrich]

commit 59da3f5cde21be4a26c50311144c395868797a89
Merge: d7a8b7f 171a4a0
Author: raveit65 <chat-to-me at raveit.de>
Date:   Thu Jan 2 18:59:56 2014 +0100

    git merge f19

 .gitignore        |    1 +
 mate-keyring.spec |   25 ++++++++++++++-----------
 sources           |    2 +-
 3 files changed, 16 insertions(+), 12 deletions(-)
---