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

[Matej Cepl]

commit af0537d1775ea2ed80e9e8522c4cb2d81e1403ef
Merge: 21ed96c 61efdb1
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Mon Aug 30 13:29:17 2010 +0200

    Merge branch 'f14' into f13

 tigase-server.spec |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---