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

[leigh123linux]

commit e7d1b3422f07168f53a6b03822b25cab73571670
Merge: b52f806 113da80
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Sun Feb 9 15:38:52 2014 +0000

    Merge branch 'master' into f20

 cinnamon.spec   |    9 ++++++++-
 set_wheel.patch |   14 ++++++++++++++
 2 files changed, 22 insertions(+), 1 deletions(-)
---