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

[Rex Dieter]

commit e1118366c169dd5bdd2c19e3cf0d5482f7561f17
Merge: 09bcdae 3cf46f3
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:19:20 2014 -0500

    Merge branch 'master' into f20

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