Diff

prosodyctl @ 6017:ac0879a8190a

Merge 0.9 -> 0.10
author Kim Alvefur <zash@zash.se>
date Wed, 12 Feb 2014 19:26:22 +0100
parent 5809:be997c6a69be
child 6038:b3ceb7627e27
line wrap: on
line diff