Diff

doc/roster_format.txt @ 7188:e8f20be3e6f8

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Mon, 22 Feb 2016 18:46:59 +0100
parent 132:9a4aa57af367
line wrap: on
line diff