[tigase-server/el5/master: 2/2] Merge branch 'master' into el5

[Matej Cepl]

commit e184c5e02fa9e8996bdf8582eafbd356fc2c443e
Merge: fee1bc6 19ebf74
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Mon Aug 30 13:23:34 2010 +0200

    Merge branch 'master' into el5

 tigase-server-RH-build.patch |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---