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

[Rex Dieter]

commit 15e3e11949fc1e0be2f8fd99675264f7988532f9
Merge: 3d322fb 40c8b50
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 23:22:17 2014 -0500

    Merge branch 'master' into f20

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