Diff

prosodyctl @ 2161:6f91d5348847

Merge with trunk
author Matthew Wild <mwild1@gmail.com>
date Mon, 23 Nov 2009 20:22:37 +0000
parent 2065:c384ae8ee17a
child 2277:c5d3905c98a6
child 2786:534e171036ef
line wrap: on
line diff