Comparison

doc/lxmppd_core_rostermanager.txt @ 475:fe861de7a4fc

Forced merge.
author Tobias Markmann <tm@ayena.de>
date Sat, 29 Nov 2008 11:24:59 +0100
parent 23:236375777f8c
comparison
equal deleted inserted replaced
474:666e22848890 475:fe861de7a4fc