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

[Rex Dieter]

commit 377544b19033c236ebee0fa9457fd449c377a17d
Merge: 1d8056f d34ff62
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Oct 11 22:30:21 2014 -0500

    Merge branch 'master' into f20

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