commit 11d7f3dd6b04571ac30a210d42c31d0c3e5af063
Merge: 163546f 84132c8
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Tue Jul 1 09:13:04 2014 -0500
Merge branch 'master' into f20
.gitignore | 2 +-
kiten.spec | 23 ++++++++++++++++++++++-
sources | 2 +-
3 files changed, 24 insertions(+), 3 deletions(-)
---