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

[Rex Dieter]

commit 25ae10fc5d4395eef97d7eca683938c8e0b4ea0f
Merge: e999dfc 6615815
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jul 14 23:02:56 2014 -0500

    Merge branch 'master' into f20

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