commit 09bcdae5682d9f1d1933be86e1cc0958f138ed02
Merge: 8eaa810 8a36447
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Mon Jun 30 22:34:18 2014 -0500
Merge branch 'master' into f20
.gitignore | 16 +++++-----------
amor.spec | 23 ++++++++++++++++++++++-
sources | 2 +-
3 files changed, 28 insertions(+), 13 deletions(-)
---