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

[Rex Dieter]

commit 5c17bd9ef14e6d603cb49637a4c5b659600b4fe8
Merge: 098df3c 79b9031
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:48:05 2014 -0500

    Merge branch 'master' into f20

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