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

[leigh123linux]

commit 086d16d38f3f76500a55a337f8afe8f958f91422
Merge: d17bde5 332e307
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Wed Nov 26 19:01:02 2014 +0000

    Merge branch 'master' into f21

 cinnamon-control-center.spec |    8 +++++++-
 mobile_network.patch         |   22 ++++++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletions(-)
---