[ejabberd/el5/master: 2/2] Merge branch 'master' into el5/master
Peter Lemenkov
peter at fedoraproject.org
Fri Sep 3 04:48:37 UTC 2010
commit 13c13ac235783621b4f0d9a8ea140bc161d537db
Merge: 54371b7 debe206
Author: Peter Lemenkov <lemenkov at gmail.com>
Date: Fri Sep 3 08:48:18 2010 +0400
Merge branch 'master' into el5/master
ejabberd-0010-Fix-http-poll.patch | 28 ----
....1-driver-explicitly-to-avoid-races-in-LD.patch | 25 +++
...ml.c-correctly-compiles-on-R14A-EJAB-1288.patch | 157 ++++++++++++++++++++
ejabberd-0012-fixes-typo-for-table-copy.patch | 25 +++
...d-0013-fixes-ampersand-escaping-EJAB-1258.patch | 26 ++++
...-poll-for-correctly-parsing-binary-thanks.patch | 31 ++++
ejabberd.spec | 27 +++-
7 files changed, 287 insertions(+), 32 deletions(-)
---
More information about the scm-commits
mailing list