commit ba650475327f22e007fc7648795f548634afa8c6 Merge: bad1487 df258d0 Author: Rex Dieter <rdieter at math.unl.edu> Date: Mon Jun 30 16:58:39 2014 -0500 Merge branch 'master' into f20 .gitignore | 6 ++++++ libkexiv2.spec | 23 ++++++++++++++++++++++- sources | 2 +- 3 files changed, 29 insertions(+), 2 deletions(-) ---