[marble/f20: 16/16] Merge branch 'master' into f20

[Rex Dieter]

commit 6c8252347c0231ef7ff9305b2d9eb0c991ed505d
Merge: a357b51 8e0e1d4
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 20:52:43 2014 -0500

    Merge branch 'master' into f20

 .gitignore  |    6 ++++++
 marble.spec |   45 ++++++++++++++++++++++++++++++++++++++++-----
 sources     |    2 +-
 3 files changed, 47 insertions(+), 6 deletions(-)
---