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

[Rex Dieter]

commit f7e16e5fc1f2c88c0e6a22e3a909363c30083d3b
Merge: 6ffbac5 b4016ce
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:50:45 2014 -0500

    Merge branch 'master' into f20

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