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

[Rex Dieter]

commit 7542a17e9a2099dea82d904dde4fb2b363ecf86b
Merge: 8766ec3 beae01b
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:52:27 2014 -0500

    Merge branch 'master' into f20

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