Diff

prosodyctl @ 6010:fad7084a0b35

Merge 0.9->0.10
author Kim Alvefur <zash@zash.se>
date Thu, 06 Feb 2014 10:48:41 +0100
parent 5809:be997c6a69be
child 6038:b3ceb7627e27
line wrap: on
line diff