Comparison

doc/roster_format.txt @ 7885:236b5a6154b2

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sat, 04 Feb 2017 01:08:27 +0100
parent 132:9a4aa57af367
comparison
equal deleted inserted replaced
7878:2fdb7b3648d8 7885:236b5a6154b2