Comparison

prosodyctl @ 5932:d0e74450968f

Merge 0.10->trunk
author Matthew Wild <mwild1@gmail.com>
date Fri, 29 Nov 2013 20:11:53 +0000 (2013-11-29)
parent 5809:be997c6a69be
child 6038:b3ceb7627e27
comparison
equal deleted inserted replaced
5929:e6d5956d05e6 5932:d0e74450968f