[kompare/f20: 4/4] Merge branch 'master' into f20

[Rex Dieter]

commit 4ecdee1412a971a0678747b7b40414bff77a681d
Merge: 3cca261 e723d9c
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jan 20 09:24:53 2015 -0600

    Merge branch 'master' into f20

 .gitignore   |   23 +----------------------
 kompare.spec |   38 ++++++++++++++++++++++++--------------
 sources      |    2 +-
 3 files changed, 26 insertions(+), 37 deletions(-)
---