Comparison

core/s2smanager.lua @ 6232:d7dc71d9171d

Merge with Prosody trunk
author Matthew Wild <mwild1@gmail.com>
date Thu, 08 May 2014 18:09:59 +0100
parent 5776:bd0ff8ae98a8
child 6663:d3023dd07cb6
comparison
equal deleted inserted replaced
6145:69bc9dfcbd89 6232:d7dc71d9171d