Diff

doc/roster_format.txt @ 6745:6728ad041761

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Thu, 25 Jun 2015 18:57:43 +0200
parent 132:9a4aa57af367
line wrap: on
line diff