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

[Rex Dieter]

commit 6ffbac579ff432bfaf20aa7b6906d4ba9e868013
Merge: c63d7f4 cfcf131
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 23:21:33 2014 -0500

    Merge branch 'master' into f20

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