Diff

prosodyctl @ 5905:91b48772b27b

Merge 0.10->trunk
author Matthew Wild <mwild1@gmail.com>
date Sat, 09 Nov 2013 18:37:13 +0000
parent 5809:be997c6a69be
child 6038:b3ceb7627e27
line wrap: on
line diff