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

[Rex Dieter]

commit b3f584dd32efb40db06e6f186423de3cfa5cedfa
Merge: a4e88cd db8f7e3
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:22:53 2014 -0500

    Merge branch 'master' into f20

 .gitignore    |    1 +
 kalgebra.spec |    7 +++++--
 sources       |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)
---