commit 2ae298b955f79b305c6e5a20fd5dd12a0d5aa5d7
Merge: 85ffa71 1ffd2cf
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Sat Dec 29 06:51:56 2012 -0600
Merge branch 'f18' into f17
.gitignore | 1 +
kdeadmin.spec | 15 +++++++++------
sources | 2 +-
3 files changed, 11 insertions(+), 7 deletions(-)
---