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

[Rex Dieter]

commit cc56b8aaf6cb6e840253ae016d335b6e5e2df383
Merge: 56ced06 95ed67f
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Nov 6 20:42:20 2012 -0600

    Merge branch 'f18' into f17

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