commit cd072149a642ed933f8e653160a722753e10c7f6 Merge: fe2cebd af8f954 Author: Rex Dieter <rdieter at math.unl.edu> Date: Tue Jul 15 11:17:37 2014 -0500 Merge branch 'master' into f20 .gitignore | 1 + smokekde.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) ---