commit 124b2b5b459dfecb0c7a66f03811a983ee529700 Merge: ca2e280 a76bb7e Author: Rex Dieter <rdieter at math.unl.edu> Date: Mon Jun 30 23:07:11 2014 -0500 Merge branch 'master' into f20 .gitignore | 6 ++++++ knetwalk.spec | 23 ++++++++++++++++++++++- sources | 2 +- 3 files changed, 29 insertions(+), 2 deletions(-) ---