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

[Rex Dieter]

commit 1fab376ab11eb0c7336c40fef7c16dc35e35ca5d
Merge: 5de2bf7 b7cbb48
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:45:57 2014 -0500

    Merge branch 'master' into f20

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