[killbots/f20: 9/9] Merge branch 'master' into f20

[Rex Dieter]

commit 6de6609ca0f07bb94159d71426ebf53d9813a136
Merge: 3322eec 7488de2
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Feb 3 09:30:16 2014 -0600

    Merge branch 'master' into f20

 .gitignore    |    6 ++++++
 killbots.spec |   20 +++++++++++++++++++-
 sources       |    2 +-
 3 files changed, 26 insertions(+), 2 deletions(-)
---