Comparison

prosodyctl @ 5923:002db30661da

Merge 0.10->trunk
author Matthew Wild <mwild1@gmail.com>
date Thu, 21 Nov 2013 02:15:36 +0000
parent 5809:be997c6a69be
child 6038:b3ceb7627e27
comparison
equal deleted inserted replaced
5920:0e5a38ba4c15 5923:002db30661da