commit d67dcf5810d5b7052fa4b70304e40712e5384cd2 Merge: b1d1ae5 415a840 Author: Matěj Cepl <mcepl at redhat.com> Date: Tue Oct 19 17:05:48 2010 +0200 Merge branch 'master' into el5 .gitignore | 1 + sources | 2 +- tigase-utils.spec | 9 ++++++--- 3 files changed, 8 insertions(+), 4 deletions(-) ---