commit 25480f567a21da0833d32b925deef5b515ca214a Merge: 15e3e11 2acf381 Author: Rex Dieter <rdieter at math.unl.edu> Date: Tue Jul 15 12:51:16 2014 -0500 Merge branch 'master' into f20 .gitignore | 1 + parley.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) ---