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

[Rex Dieter]

commit 7aaa7311f1fb4700fabaaeb0c8129a65fb91da12
Merge: c875bb3 4603a4b
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:36:59 2014 -0500

    Merge branch 'master' into f20

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