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

[Rex Dieter]

commit ebb2f047c20be12b20012390cdca39dfc08846b9
Merge: 8203745 8f19f7f
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Feb 3 11:16:47 2014 -0600

    Merge branch 'master' into f20

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