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

[Rex Dieter]

commit efca70e33dffb46e1af1cc8608b5aac6305e87c2
Merge: e111836 c16869a
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Sep 16 19:57:34 2014 -0500

    Merge branch 'master' into f20

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