Comparison

prosodyctl @ 8009:1c311d8c1443

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Mon, 27 Mar 2017 18:30:11 +0200
parent 7923:81f3068fc30c
child 8015:ecb110f45c92
comparison
equal deleted inserted replaced
8008:62ed3795be13 8009:1c311d8c1443