Comparison

prosodyctl @ 6794:e3c51bf7861b

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sat, 22 Aug 2015 21:01:00 +0200
parent 6784:4da860edc27c
child 6837:13b44929ae49
comparison
equal deleted inserted replaced
6792:8b284787fe26 6794:e3c51bf7861b