[kjumpingcube/f20: 9/9] Merge branch 'master' into f20

[Rex Dieter]

commit 820e6ef9e52354973c8004b87429e11b3e26b19c
Merge: 15645b7 0f49dcd
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Feb 3 09:49:15 2014 -0600

    Merge branch 'master' into f20

 .gitignore        |    6 ++++++
 kjumpingcube.spec |   20 +++++++++++++++++++-
 sources           |    2 +-
 3 files changed, 26 insertions(+), 2 deletions(-)
---