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

[Rex Dieter]

commit f73b0e90f6f48576645dc26a0958abf67c648fab
Merge: 3f514cf 37f018a
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Oct 11 22:10:06 2014 -0500

    Merge branch 'master' into f20

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