[kollision/f19: 7/7] Merge branch 'master' into f19

[Rex Dieter]

commit b5845d5c99c2bd48a01561a6ec53f13b8fdc62ab
Merge: 1c0d4d0 f3c9f3c
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Sep 5 13:37:51 2013 -0500

    Merge branch 'master' into f19

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