[superkaramba/f17: 2/2] Merge branch 'f18' into f17

[Rex Dieter]

commit d43abdd2de9120e4cdec484d9854451f29c05621
Merge: b5e69e8 2c0aa13
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Nov 6 20:45:15 2012 -0600

    Merge branch 'f18' into f17

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