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

[Rex Dieter]

commit 489de5e89d556926f41012753e4bd92e21b7852e
Merge: 75161cf dc9a276
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jan 20 10:37:49 2015 -0600

    Merge branch 'master' into f20

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