Diff

doc/roster_format.txt @ 6920:7596c37e0a63

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Mon, 09 Nov 2015 22:56:32 +0100
parent 132:9a4aa57af367
line wrap: on
line diff