Diff

prosodyctl @ 5206:b4de85209ccf

Merge
author Matthew Wild <mwild1@gmail.com>
date Thu, 29 Nov 2012 07:17:31 +0500 (2012-11-29)
parent 5160:da7fe5de82fb
child 5303:19a4a3462574
line wrap: on
line diff