[libkomparediff2/f20: 5/5] Merge branch 'master' into f20

[Rex Dieter]

commit 80ed5f01d660cb1e7192ede649f9c54aa2f4fb90
Merge: 25ae10f 27314e7
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Sep 16 16:42:00 2014 -0500

    Merge branch 'master' into f20

 .gitignore           |    3 +++
 libkomparediff2.spec |   14 +++++++++++++-
 sources              |    2 +-
 3 files changed, 17 insertions(+), 2 deletions(-)
---