[knetwalk/f20: 2/2] Merge branch 'master' into f20

[Rex Dieter]

commit 9c658047d62f14bc79407d2a1a20532e1d9bf1c7
Merge: 124b2b5 53a003b
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:40:50 2014 -0500

    Merge branch 'master' into f20

 .gitignore    |    1 +
 knetwalk.spec |    5 ++++-
 sources       |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---