commit 39a437552b82a7913b656fd9ac5345bb4ad6a0be
Merge: aca9156 a8dfc1b
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Sun Jan 18 13:35:06 2015 -0600
Merge branch 'master' into f20
.gitignore | 1 +
kdepim.spec | 42 +++++++++++++++++++++++-------------------
sources | 2 +-
3 files changed, 25 insertions(+), 20 deletions(-)
---