commit 1f01c503896eeb8a8a5a8a8f78f0c9d6978444cc
Merge: 6c82523 cad2f41
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Tue Jul 15 08:42:55 2014 -0500
Merge branch 'master' into f20
.gitignore | 1 +
marble.spec | 26 +++++++++++++++++---------
sources | 2 +-
3 files changed, 19 insertions(+), 10 deletions(-)
---