[ejabberd/el6/master: 2/2] Merge branch 'master' into el6/master

[Peter Lemenkov]

commit 59bb73aaa7e59369cfa21301f736bbb88afb0b96
Merge: 90c22fb debe206
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Fri Aug 27 11:10:29 2010 +0400

    Merge branch 'master' into el6/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(-)
---