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

[leigh123linux]

commit f301d2f50ee239a6dadc1fb87d280744969a2f94
Merge: ad00e69 fe5ea0b
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Sun Mar 1 08:43:45 2015 +0000

    Merge branch 'master' into f21

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