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

[Rex Dieter]

commit a11558be97798314bf5603645920de7a8f6c755a
Merge: c7ee4d6 cc48e03
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Feb 3 12:15:11 2014 -0600

    Merge branch 'master' into f20

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