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

[Rex Dieter]

commit 8766ec32bf0757cdae3a76d4d473f0586659a68e
Merge: 0db35d3 0935e39
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 23:24:10 2014 -0500

    Merge branch 'master' into f20

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