Comparison

prosodyctl @ 5770:7722372aa087

Merge 0.9->trunk
author Kim Alvefur <zash@zash.se>
date Tue, 06 Aug 2013 14:35:03 +0200
parent 5723:24b6eb65480c
child 5809:be997c6a69be
comparison
equal deleted inserted replaced
5765:d854c17a45fd 5770:7722372aa087