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

[leigh123linux]

commit 110ed1c28c13129e006fb359ae6fb1d0f3fa0b37
Merge: 141d9ad 1c1be0a
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Wed Jun 11 23:59:51 2014 +0100

    Merge branch 'master' into f20

 polkit-cinnamon-authentication-agent-1.desktop |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---