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

[Rex Dieter]

commit 4362d000f81b01343b79b59e89e633c72f17ee24
Merge: 11d7f3d 1581ee1
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:37:27 2014 -0500

    Merge branch 'master' into f20

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