commit 9607441c6b6379f3a79ae1486eef8617bf974b4a
Merge: 5868f11 4ad6fd4
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Thu Jun 7 20:18:07 2012 -0500
Merge branch 'f17' into f16
.gitignore | 1 +
kdemultimedia.spec | 10 ++++++++--
sources | 2 +-
3 files changed, 10 insertions(+), 3 deletions(-)
---