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

[Rex Dieter]

commit 2066ea75dd0923291b42bfb9f432f0d89661d7fa
Merge: 3b7184c 6387f6b
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:52:57 2014 -0500

    Merge branch 'master' into f20

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