Diff

prosodyctl @ 5205:f7ff48494c2b

Merge 0.9->trunk
author Matthew Wild <mwild1@gmail.com>
date Thu, 29 Nov 2012 07:16:45 +0500
parent 5160:da7fe5de82fb
child 5303:19a4a3462574
line wrap: on
line diff