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

[Rex Dieter]

commit 5870e6a368fe2ad8a140225fd692f14741e7bda9
Merge: cd271a2 74a2d3e
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Feb 3 07:14:05 2014 -0600

    Merge branch 'master' into f20

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