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

[Rex Dieter]

commit 0c25e3c3d025e700f5daf335c8932137081d942e
Merge: 34a60d3 dda2804
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Sep 16 20:30:46 2014 -0500

    Merge branch 'master' into f20

 .gitignore       |    3 +++
 ksaneplugin.spec |   14 +++++++++++++-
 sources          |    2 +-
 3 files changed, 17 insertions(+), 2 deletions(-)
---