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

[Rex Dieter]

commit 2aee8126cbe2f98d223a294e095b6380c67935fe
Merge: 215e2fb 5325b86
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Fri Sep 27 23:05:01 2013 -0500

    Merge branch 'master' into f20

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