Diff

doc/roster_format.txt @ 490:9087f39b4222

Another automatic merge, this gets annoying."
author Tobias Markmann <tm@ayena.de>
date Sat, 29 Nov 2008 22:11:21 +0100
parent 132:9a4aa57af367
line wrap: on
line diff