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

[Rex Dieter]

commit 34a60d355ed6a6d2a50bc899d0e5b774faf996cc
Merge: e9fe90d 16bcdc2
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:44:34 2014 -0500

    Merge branch 'master' into f20

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