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

[Rex Dieter]

commit 3b7184c214fde02715d8515467d24cc409e6525d
Merge: dc6f0c3 598ab3e
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 23:24:53 2014 -0500

    Merge branch 'master' into f20

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