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

[Rex Dieter]

commit dd8bd5542d8dda10db8f1af4387cbd7f6d2cfb25
Merge: 5f1ec3f fdec6e3
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Dec 29 07:56:12 2012 -0600

    Merge branch 'f18' into f17

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