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

[leigh123linux]

commit 590881d7576bb84eaa3bffdca11bd7dbdf824cc3
Merge: 9437bc9 a0d2e6e
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Sun Dec 22 10:05:11 2013 +0000

    Merge branch 'master' into f20

 cinnamon.spec             |    9 ++++++++-
 upower_calender_fix.patch |   11 +++++++++++
 2 files changed, 19 insertions(+), 1 deletions(-)
---