25
1
mirror of https://github.com/processone/ejabberd.git synced 2024-11-26 16:26:24 +01:00
xmpp.chapril.org-ejabberd/src/pam
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
..
epam.c Merge from trunk (r1787 to r1804). 2009-01-19 14:47:33 +00:00
epam.erl Merge from trunk (r1787 to r1804). 2009-01-19 14:47:33 +00:00
Makefile.in Merge revisions from 1444 to revision 1457 from trunk. 2008-07-17 15:33:50 +00:00