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

[Rex Dieter]

commit 75161cfbccb08246c0fdcbef507a34993eb13770
Merge: 99363dd 115014c
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Nov 8 20:19:58 2014 -0600

    Merge branch 'master' into f20

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