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

[Rex Dieter]

commit f97f8abca9d59b85af7dcec2142496536f725f26
Merge: fcc5d79 31b6d39
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Jul 17 07:46:24 2014 -0500

    Merge branch 'master' into f20

 cinnamon.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---