[tigase-server/el6/master: 5/5] Merge branch 'f14' into el6

[Matej Cepl]

commit 15ce5bf0a741f930f42b4a5ae35685d56342c383
Merge: f714b7a af0537d
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Mon Aug 30 13:43:26 2010 +0200

    Merge branch 'f14' into el6

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