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

[Rex Dieter]

commit b9d279872965e6de2b40772344fbd1d75dc5db7d
Merge: 558a766 59e86dc
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:52:12 2014 -0500

    Merge branch 'master' into f20

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