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

[Rex Dieter]

commit 05e9d9cf651508146969178dab2206e8f98ab298
Merge: 04562aa d90eabd
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Feb 3 12:24:06 2014 -0600

    Merge branch 'master' into f20

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