Diff

prosodyctl @ 6157:44de98f516f5

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 27 Apr 2014 01:02:54 +0200
parent 6062:6cc6b4d407df
child 6158:08e9c9d0beb3
line wrap: on
line diff