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

[leigh123linux]

commit b0283de016079f40e03e8a7e580326cc297c9817
Merge: f97f8ab 81f8a8f
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Tue Jul 29 21:00:14 2014 +0200

    Merge branch 'master' into f20

 ...ttings-User-Don-t-print-passwords-to-stdo.patch |   27 ++++++++++++++++++++
 cinnamon.spec                                      |    9 ++++++-
 2 files changed, 35 insertions(+), 1 deletions(-)
---