commit f82eda2ae1b39afdbf4fb21686c059ca6be5b5cc Merge: f5884b3 5005cd2 Author: Martin Briza <mbriza at redhat.com> Date: Thu Mar 7 13:35:18 2013 +0100 Merge branch 'f18' Conflicts: spherical-cow-kde-theme.spec spherical-cow-kde-theme.spec | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) ---