commit 27515de98ec97a60d237ec22c0f573e521c37ad1 Merge: 569900c 810c7ce Author: Robert Scheck <robert at fedoraproject.org> Date: Wed Apr 6 01:18:23 2011 +0200 Merge remote branch 'origin/master' into el4 zarafa.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---