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

[Rex Dieter]

commit 97b9e2a6d217f741ab139e3f4e21cdf7828e4130
Merge: 79bdda9 e7fb2fe
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:41:16 2014 -0500

    Merge branch 'master' into f20

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