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

[leigh123linux]

commit 8e46cf2d0122c2af469cc7c00b96cb6eb3b4efd5
Merge: 271c862 9df6e4c
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Tue Dec 2 09:53:19 2014 +0000

    Merge branch 'master' into f20

 sources |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
---