[ksaneplugin/f20: 2/2] Merge branch 'master' into f20

[Rex Dieter]

commit 99363ddec369bd59d4c74e54906453cf3e513c25
Merge: 0c25e3c 62ce6db
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Oct 11 22:19:56 2014 -0500

    Merge branch 'master' into f20

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