Comparison

prosodyctl @ 6469:93ffe59a9546

Merge 0.10->trunk
author Waqas Hussain <waqas20@gmail.com>
date Wed, 08 Oct 2014 18:47:01 -0400
parent 6405:61801dacc90b
child 6486:64146196b142
comparison
equal deleted inserted replaced
6465:ab68bb837fe0 6469:93ffe59a9546