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

[Rex Dieter]

commit 81f6ebc37b846d0d1e1ea8292251cf2c01221db2
Merge: f73b0e9 04b5fbf
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Nov 8 20:10:47 2014 -0600

    Merge branch 'master' into f20

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