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

[Rex Dieter]

commit 4f06d78484ef5560d85cb33e0894cb78f6396b5e
Merge: 04a91d0 89be109
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jan 20 09:24:09 2015 -0600

    Merge branch 'master' into f20

 .gitignore     |    2 ++
 kollision.spec |   12 +++++++++---
 sources        |    2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)
---