[kspaceduel/f20: 5/5] Merge branch 'master' into f20

[Rex Dieter]

commit 5e2f89d918098cee2a43866055ca28775bb5f02b
Merge: 1fab376 74f9d88
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Sep 16 20:32:50 2014 -0500

    Merge branch 'master' into f20

 .gitignore      |    3 +++
 kspaceduel.spec |   14 +++++++++++++-
 sources         |    2 +-
 3 files changed, 17 insertions(+), 2 deletions(-)
---