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

[Rex Dieter]

commit c875bb34e296610e93e5cb37fc82651623bbbfb5
Merge: 21ba9ed 0f22cb4
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 23:01:31 2014 -0500

    Merge branch 'master' into f20

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