24
1
mirror of https://github.com/processone/ejabberd.git synced 2024-07-02 23:06:21 +02:00
xmpp.chapril.org-ejabberd/src/eldap
Jean-Sébastien Pédron ff500d8297 Merge from trunk (r1787 to r1804).
Included are fixes to src/mod_configure.erl and src/mod_caps.erl.

Note: this merge doesn't include the following revisions because it was
made by previous commits:
r1766, r1768, r1781, r1783, r1794, r1797, r1799, r1802.

Warning: Ejabberd may be broken until the merge is completly finished.

PR:		EJABP-1

SVN Revision: 1829
2009-01-19 14:47:33 +00:00
..
eldap_filter.erl Merge from trunk (r1787 to r1804). 2009-01-19 14:47:33 +00:00
eldap_pool.erl Merge from trunk (r1787 to r1804). 2009-01-19 14:47:33 +00:00
eldap_utils.erl Merge from trunk (r1787 to r1804). 2009-01-19 14:47:33 +00:00
eldap.erl * src/eldap.erl: Improved logging. We now use ejabberd logging framework (EJAB-582). 2008-03-20 16:28:36 +00:00
eldap.hrl Merge from trunk (r1787 to r1804). 2009-01-19 14:47:33 +00:00
ELDAPv3.asn * src/cyrsasl_digest.erl: Bugfix (thanks to Sergei Golovan) 2003-11-23 20:11:21 +00:00
Makefile.in Merge from trunk (r1649 to r1692). 2008-12-01 15:53:30 +00:00
Makefile.win32 Merge from trunk (r1649 to r1692). 2008-12-01 15:53:30 +00:00