[parley/f18: 7/7] Merge branch 'master' into f18

[Rex Dieter]

commit 30907ad65281b65f52368176506d5190d3e95ca8
Merge: fdec6e3 1a0824c
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Mar 4 09:49:33 2013 -0600

    Merge branch 'master' into f18
    
    Conflicts:
    	.gitignore
    	parley.spec
    	sources

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