commit 90a658a53d21a85a1caefd895e1536350ebedb20
Merge: 23e5db7 e02edc8
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Mon Jun 30 23:25:37 2014 -0500
Merge branch 'master' into f20
.gitignore | 6 ++++++
kimono.spec | 23 ++++++++++++++++++++++-
sources | 2 +-
3 files changed, 29 insertions(+), 2 deletions(-)
---