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

[Rex Dieter]

commit e9fe90defb0e01628875d3d829353198f803355f
Merge: f476a21 6ed7454
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 23:12:55 2014 -0500

    Merge branch 'master' into f20

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