Diff

prosodyctl @ 5560:cdb057244e44

Merge tls branch
author Matthew Wild <mwild1@gmail.com>
date Wed, 01 May 2013 13:57:11 +0100
parent 5554:e91db0aac408
child 5584:1d841117117c
line wrap: on
line diff