Diff

prosodyctl @ 6088:be10c6c5aa7f

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