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

[Rex Dieter]

commit 98ca24cff8275b5259eedf9a90a944011086c556
Merge: 7c28eac 53e523c
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Nov 8 16:15:54 2014 -0600

    Merge branch 'master' into f20

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