commit 48f42986fedd69fe017e67c66b7ce00630ab9b9e Merge: f95bdfc 6747d19 Author: Rex Dieter <rdieter at math.unl.edu> Date: Thu Sep 5 13:01:20 2013 -0500 Merge branch 'master' into f19 .gitignore | 5 +++++ granatier.spec | 17 ++++++++++++++++- sources | 2 +- 3 files changed, 22 insertions(+), 2 deletions(-) ---