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

[Rex Dieter]

commit 3767fc2104aed6a9528cb73b38e45e66a63f2969
Merge: 64fc8af f9be33c
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jan 19 20:59:47 2015 -0600

    Merge branch 'master' into f20

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