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

[Rex Dieter]

commit e03529ee77bac82ce20557bb55789ed958323659
Merge: bcba5f8 5126ffa
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:37:14 2014 -0500

    Merge branch 'master' into f20

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