Diff

doc/roster_format.txt @ 6028:14c63b8c3e06

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Wed, 26 Feb 2014 22:22:43 +0100
parent 132:9a4aa57af367
line wrap: on
line diff