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

[Rex Dieter]

commit 9708012d7954710126c3871b3000ff40fa53bdd0
Merge: 2066ea7 f70e8cf
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Sep 16 20:43:04 2014 -0500

    Merge branch 'master' into f20

 .gitignore   |    3 +++
 sources      |    2 +-
 sweeper.spec |   14 +++++++++++++-
 3 files changed, 17 insertions(+), 2 deletions(-)
---