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

[Rex Dieter]

commit 08dcf3ed5ff4832c8c331ef14ec6f24518c73184
Merge: a3109ce 3f7e21f
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jan 19 20:59:01 2015 -0600

    Merge branch 'master' into f20

 .gitignore    |    2 ++
 killbots.spec |   12 +++++++++---
 sources       |    2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)
---