[mawk/f17: 8/8] Merge branch 'master' into f17

[mmckinst]

commit 3647afb482e6c8440425e1c5219258b962c94bee
Merge: d83096c a0154fe
Author: Mark McKinstry <mmckinst at nexcess.net>
Date:   Tue Jun 18 20:34:45 2013 -0400

    Merge branch 'master' into f17

 mawk.spec |   12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)
---