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

[Rex Dieter]

commit dcebe39035193611a2e0a63ded927c5485d1a1f8
Merge: 5b995fd 924c7c7
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Feb 3 07:10:53 2014 -0600

    Merge branch 'master' into f20

 .gitignore |    6 ++++++
 amor.spec  |   20 +++++++++++++++++++-
 sources    |    2 +-
 3 files changed, 26 insertions(+), 2 deletions(-)
---