commit 4133e4c4d03d2a5a0295d106c6f6621cb2e66ec6
Merge: 1f01c50 1514e46
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Tue Sep 16 15:59:41 2014 -0500
Merge branch 'f21' into f20
.gitignore | 3 +++
marble.spec | 30 ++++++++++++++++++++++++++----
sources | 2 +-
3 files changed, 30 insertions(+), 5 deletions(-)
---