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

[Rex Dieter]

commit 336a526e1eade2e2dabd9e5558e84de89f021aa5
Merge: ee2e74f 6a41808
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Nov 8 20:30:25 2014 -0600

    Merge branch 'master' into f20

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