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

[Rex Dieter]

commit 1d8056f208adf76f91e45d7de9bb97480251f034
Merge: 7542a17 aae03f3
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Sep 16 20:42:19 2014 -0500

    Merge branch 'master' into f20

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