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

[Rex Dieter]

commit 9aa632b3701b7e533c98f8cb0c7d3c0188a03634
Merge: fdbeaeb ed0d264
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Mar 5 12:40:27 2015 -0600

    Merge branch 'master' into f20

 .gitignore | 4 ++--
 kiten.spec | 9 ++++++---
 sources    | 2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)
---