commit 8eb5d44be26187f14c99c1aafbc3b3d60771ed01
Merge: 58942ea dd1b57a
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Mon Feb 3 07:27:36 2014 -0600
Merge branch 'master' into f20
.gitignore | 6 ++++++
dragon.spec | 20 +++++++++++++++++++-
sources | 2 +-
3 files changed, 26 insertions(+), 2 deletions(-)
---