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

[Rex Dieter]

commit d8a79982ec77aa6a726d06cc12dc275b7444b6fc
Merge: 97fd9fb c30a236
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Sep 5 13:29:43 2013 -0500

    Merge branch 'master' into f19

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