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

[leigh123linux]

commit a4161b83c52848bf3deb9870ffd086f7b94970b3
Merge: a5469ea 31bd3b4
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Wed Jul 2 12:16:34 2014 +0100

    Merge branch 'master' into f20

 cinnamon.spec                  |    6 ++-
 network-user-connections.patch |   85 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 90 insertions(+), 1 deletions(-)
---