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

[leigh123linux]

commit b0227e416ac17acfecd8b30dfe77028db75ad6f9
Merge: 45bc2b5 332e307
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Wed Nov 26 19:02:10 2014 +0000

    Merge branch 'master' into f20

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