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

[Rex Dieter]

commit 4ba7b061f4756af9272cd099fa91e4741acedeca
Merge: 4ecdee1 92d3eb9
Author: Rex Dieter <rdieter at gmail.com>
Date:   Sun Mar 1 17:18:29 2015 -0600

    Merge branch 'master' into f20

 .gitignore   |  2 ++
 kompare.spec | 15 ++++++++++++---
 sources      |  2 +-
 3 files changed, 15 insertions(+), 4 deletions(-)
---