[cinnamon-control-center/f20: 2/2] Merge branch 'master' into f20

[leigh123linux]

commit e992061754610ea8614bb9794fe04fbb8ea6e511
Merge: 8e46cf2 fe5ea0b
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Sun Mar 1 08:44:14 2015 +0000

    Merge branch 'master' into f20

 ...NetworkManager-version-checking-altogethe.patch | 59 ++++++++++++++++++++++
 cinnamon-control-center.spec                       |  7 ++-
 2 files changed, 65 insertions(+), 1 deletion(-)
---