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

[Rex Dieter]

commit 63ae06bfeb6f893d781bda9b60160dd94c617da5
Merge: 3640a09 6a517cb
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Dec 29 07:53:25 2012 -0600

    Merge branch 'f18' into f17

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