Diff

prosodyctl @ 3901:4447c651e6e6

Merge with 0.8
author Matthew Wild <mwild1@gmail.com>
date Sun, 19 Dec 2010 03:04:42 +0000
parent 3777:5ecbcef42ffb
child 3904:f93163081b3c
line wrap: on
line diff