Comparison

doc/roster_format.txt @ 6039:f8df0a996575

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Tue, 25 Mar 2014 19:18:32 +0100
parent 132:9a4aa57af367
comparison
equal deleted inserted replaced
6032:c0ee152400ff 6039:f8df0a996575