[amor/f20: 3/3] Merge branch 'master' into f20

[Rex Dieter]

commit fa89cb34f3451961737b4f73ae4edc5f42eb75ee
Merge: b4d385e 507c3a9
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jan 19 15:13:25 2015 -0600

    Merge branch 'master' into f20

 .gitignore |    2 ++
 amor.spec  |   14 ++++++++++----
 sources    |    2 +-
 3 files changed, 13 insertions(+), 5 deletions(-)
---