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

[Rex Dieter]

commit e2f7fc37c11cb7010de289c0ed635165c2c74da8
Merge: 6130f21 be844ba
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Nov 8 20:21:53 2014 -0600

    Merge branch 'master' into f20

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