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

[Rex Dieter]

commit 9719246efa6f83a4304c19cabb530741c1e9be04
Merge: 86ccd8d 44d89b9
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Nov 8 20:11:06 2014 -0600

    Merge branch 'master' into f20

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