Diff

doc/roster_format.txt @ 7341:aa94cd27df4d

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Wed, 06 Apr 2016 14:50:34 +0200
parent 132:9a4aa57af367
line wrap: on
line diff