Diff

prosodyctl @ 6032:c0ee152400ff

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 09 Mar 2014 23:48:32 +0100
parent 5809:be997c6a69be
child 6038:b3ceb7627e27
line wrap: on
line diff