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

[Rex Dieter]

commit 9bd0e6ae37f06d8d271a3927ffb8c19f4f9f0087
Merge: 336a526 74b16ca
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jan 20 10:49:27 2015 -0600

    Merge branch 'master' into f20

 .gitignore   |    1 +
 sources      |    2 +-
 sweeper.spec |    9 ++++++---
 3 files changed, 8 insertions(+), 4 deletions(-)
---