commit bcba5f86264bdad73fc50da56c9e7ef98954a05e Merge: 7814934 f822946 Author: Rex Dieter <rdieter at math.unl.edu> Date: Mon Jun 30 23:01:53 2014 -0500 Merge branch 'master' into f20 .gitignore | 6 ++++++ kiriki.spec | 23 ++++++++++++++++++++++- sources | 2 +- 3 files changed, 29 insertions(+), 2 deletions(-) ---