commit 56d2032391a25f92ab68aadbb1a0b3dd3d0c1c18 Merge: 16aa3cd c019ad6 Author: Rex Dieter <rdieter at math.unl.edu> Date: Mon Jun 30 22:37:23 2014 -0500 Merge branch 'master' into f20 .gitignore | 6 ++++++ filelight.spec | 23 ++++++++++++++++++++++- sources | 2 +- 3 files changed, 29 insertions(+), 2 deletions(-) ---