commit fd0952f6a8aae4572c1c533ace79c67b93ddef12
Merge: 80f51e6 be8a0ca
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Mon Jul 14 22:46:47 2014 -0500
Merge branch 'master' into f20
.gitignore | 1 +
kdepimlibs.spec | 25 +++++++++++++++++++------
sources | 2 +-
3 files changed, 21 insertions(+), 7 deletions(-)
---