]> granicus.if.org Git - ejabberd/commit
* ChangeLog: Fix conflict.
authorMickaël Rémond <mickael.remond@process-one.net>
Mon, 3 Dec 2007 10:51:22 +0000 (10:51 +0000)
committerMickaël Rémond <mickael.remond@process-one.net>
Mon, 3 Dec 2007 10:51:22 +0000 (10:51 +0000)
commitf8c4e86977db453b7672937c89261c157e383b8b
treeb3251995e0c0c47f242b9944d7691b48a04c4c36
parent1795c1a7bbbca6ba4c1d5d1d4c8f186993dc0383
* ChangeLog: Fix conflict.

SVN Revision: 1018
ChangeLog