commit 65f297df6cbf3112a965aee6f0b1ff84fb65ad7c Merge: be54faa 0cd61e3 Author: Rex Dieter <rdieter at math.unl.edu> Date: Thu Sep 5 13:36:54 2013 -0500 Merge branch 'master' into f19 .gitignore | 5 +++++ knetwalk.spec | 17 ++++++++++++++++- sources | 2 +- 3 files changed, 22 insertions(+), 2 deletions(-) ---