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

Fri Jan 3 17:27:43 UTC 2014

commit 93d3b33f8584cd00fc8dbbeb928c4a07854c61ec
Merge: 2dd0c4a f79ba64
Author: raveit65 <chat-to-me at raveit.de>
Date:   Fri Jan 3 18:27:22 2014 +0100

    Merge branch 'f20' into f18

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