commit 11e7021f4cbd78fbe8b95f9cc4a0111deb00e387 Merge: e734e85 10401a9 Author: Rex Dieter <rdieter at math.unl.edu> Date: Sat Nov 8 20:27:28 2014 -0600 Merge branch 'master' into f20 .gitignore | 1 + okteta.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) ---