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