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

[Rex Dieter]

commit 2e12a8c46c24e64eefd80308ff6f3e2a876d388e
Merge: 215fbab cc18b82
Author: Rex Dieter <rdieter at gmail.com>
Date:   Sun Mar 1 17:25:09 2015 -0600

    Merge branch 'master' into f20

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