[step/f20: 10/10] Merge branch 'master' into f20

[Rex Dieter]

commit 558a7662526783aa582948dfbd6f59636e091da6
Merge: 418591d 4ba7eaf
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 23:23:47 2014 -0500

    Merge branch 'master' into f20

 .gitignore |    6 ++++++
 sources    |    2 +-
 step.spec  |   23 ++++++++++++++++++++++-
 3 files changed, 29 insertions(+), 2 deletions(-)
---