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

[Rex Dieter]

commit 947d68d33aed4885896cb8d8d1485ff0582214cb
Merge: 0825d31 9885f7a
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 23:08:40 2014 -0500

    Merge branch 'master' into f20

 .gitignore   |    6 ++++++
 kompare.spec |   23 ++++++++++++++++++++++-
 sources      |    2 +-
 3 files changed, 29 insertions(+), 2 deletions(-)
---