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

[Rex Dieter]

commit 348f95da6767a7c4c46d255c2d8dd715cf662450
Merge: 377b5ba b84f81b
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 23:02:28 2014 -0500

    Merge branch 'master' into f20

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