commit 28ad5244160307de5c3b36071d4f5a01ad717795 Merge: af0537d c118d3c Author: Matěj Cepl <mcepl at redhat.com> Date: Tue Oct 19 12:06:37 2010 +0200 Merge branch 'master' into f13 Conflicts: tigase-server.spec tigase-server.spec | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) ---