Diff

prosodyctl @ 6150:5b59798c979a

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Wed, 23 Apr 2014 00:23:46 +0200
parent 6062:6cc6b4d407df
child 6158:08e9c9d0beb3
line wrap: on
line diff