Files
ejabberd/doc
Alexey Shchepin 52df4fa024 Merge branch '2.1.x' of git+ssh://git@gitorious.process-one.net/ejabberd/mainline.git into 2.2.x
Conflicts:
	src/configure
	src/ejabberd.app
	src/ejabberd_receiver.erl
	src/tls/tls_drv.c
	src/web/ejabberd_http.erl
2012-02-20 17:29:18 +02:00
..
2011-05-31 21:12:31 +02:00
2002-11-30 20:57:08 +00:00
2005-11-28 10:55:45 +00:00
2005-04-18 21:45:41 +00:00
2009-12-14 14:15:45 +00:00