Comparison

prosodyctl @ 4282:f5a46b73432b

Merge 0.7->0.8
author Matthew Wild <mwild1@gmail.com>
date Thu, 02 Jun 2011 00:26:23 +0100
parent 4198:3e680514df14
child 4324:5e7cba840409
comparison
equal deleted inserted replaced
4278:67ce42aa7419 4282:f5a46b73432b