[parley/f17: 8/8] Merge branch 'f18' into f17

[Rex Dieter]

commit ec489c619e66c80bfc3e2f496bd4452a0673622a
Merge: dd8bd55 30907ad
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Fri Mar 8 10:25:47 2013 -0600

    Merge branch 'f18' into f17

 .gitignore  |    7 +------
 parley.spec |   21 ++++++++++++++++++---
 sources     |    2 +-
 3 files changed, 20 insertions(+), 10 deletions(-)
---