commit fb658a6c4a4049fb466c7f4c3d4758cbaabe0ab4
Merge: 7d54cc3 932d266
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Mon Jun 30 22:37:46 2014 -0500
Merge branch 'master' into f20
.gitignore | 6 ++++++
granatier.spec | 23 ++++++++++++++++++++++-
sources | 2 +-
3 files changed, 29 insertions(+), 2 deletions(-)
---