Files
ejabberd/doc
Evgeniy Khramtsov c98ddeb59f Merge branch '2.1.x' into 2.2.x
Conflicts:
	src/ejabberd_captcha.erl
	src/expat_erl.c
	src/mod_muc/mod_muc_room.erl
2011-05-04 00:04:10 +10:00
..
2010-12-20 13:10:33 +01:00
2010-12-20 13:10:33 +01:00
2002-11-30 20:57:08 +00:00
2011-01-28 12:46:09 +01:00
2011-05-04 00:04:10 +10: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
2010-12-20 13:10:33 +01:00