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

[leigh123linux]

commit ad00e699a8957cf935a213e54b937a4163e07a12
Merge: 2c23f6d 9df6e4c
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Tue Dec 2 09:52:37 2014 +0000

    Merge branch 'master' into f21

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