[cinnamon/f19: 49/49] Merge branch 'master' into f19

[leigh123linux]

commit 544cefe50c28cf13953f24c7f1884d00460b5fd6
Merge: 9a5787d 8bc5f5e
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Wed Jan 22 18:22:36 2014 +0000

    Merge branch 'master' into f19

 cinnamon.spec |  275 +++------------------------------------------------------
 1 files changed, 13 insertions(+), 262 deletions(-)
---