Diff

doc/roster_format.txt @ 5926:4fd1e660744d

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 24 Nov 2013 14:24:53 +0100
parent 132:9a4aa57af367
line wrap: on
line diff