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

[Rex Dieter]

commit 1cb181fe0b8bbf8a2c81c801c3bf4b0352e3c94e
Merge: 348f95d e0192fc
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:37:43 2014 -0500

    Merge branch 'master' into f20

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