comparison util/jid.lua @ 4518:f2d695d2e31e

Merge 0.9->trunk
author Matthew Wild <mwild1@gmail.com>
date Fri, 09 Mar 2012 18:46:19 +0000
parents f78c6f5fa090
children bd0ff8ae98a8 f3817912e8b2
comparison
equal deleted inserted replaced
4512:eb97612bf42b 4518:f2d695d2e31e