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

[Rex Dieter]

commit 3bea602949dd03aa0eef38951da66ea5294d6077
Merge: 489de5e 292d66b
Author: Rex Dieter <rdieter at gmail.com>
Date:   Sun Mar 1 17:20:17 2015 -0600

    Merge branch 'master' into f20

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