[cantor/f19: 8/8] Merge branch 'master' into f19

[Rex Dieter]

commit e0c95e5a1e4306ea3fdd32d9eeafabf4ba7448d4
Merge: f3df2d6 e1597e5
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Sep 5 15:26:01 2013 -0500

    Merge branch 'master' into f19

 .gitignore                 |    5 ++
 cantor-4.10.3-sage58.patch |  123 --------------------------------------------
 cantor.spec                |   21 ++++++--
 sources                    |    2 +-
 4 files changed, 22 insertions(+), 129 deletions(-)
---