[mate-control-center/f19: 3/3] Merge branch 'f20' into f19

Fri Jan 3 17:00:36 UTC 2014

commit 8b5d9cd9aefb060381bd47bd64f0ce3e7b9697fc
Merge: c6b05e5 f79ba64
Author: raveit65 <chat-to-me at raveit.de>
Date:   Fri Jan 3 18:00:05 2014 +0100

    Merge branch 'f20' into f19

 .gitignore               |    1 +
 mate-control-center.spec |    7 +++++--
 sources                  |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)
---