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

[Rex Dieter]

commit 9798e0c82642db479ba35c99fee301eefa8a6b16
Merge: 49f9800 6c70a66
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Dec 29 07:57:00 2012 -0600

    Merge branch 'f18' into f17

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