commit 186075a443b6e6fe746e4fc380e4c1bff9244e8a Merge: 7619bde 69cd9e1 Author: Rex Dieter <rdieter at math.unl.edu> Date: Sun Mar 3 18:37:51 2013 -0600 Merge branch 'master' into f18 .gitignore | 1 + digikam.spec | 21 ++++++++++++++++++--- sources | 2 +- 3 files changed, 20 insertions(+), 4 deletions(-) ---