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

[Rex Dieter]

commit e999dfc4f2b9a9356ef4aa37c9dcff2373cdd232
Merge: 1415f59 3064181
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 16:59:25 2014 -0500

    Merge branch 'master' into f20

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