comparison plugins/muc/history.lib.lua @ 6679:96e034508978

Merge 0.10->trunk
author Matthew Wild <mwild1@gmail.com>
date Wed, 13 May 2015 17:00:27 +0100
parents 0f940a7ba489
children 84e01dbb739e
comparison
equal deleted inserted replaced
6666:42fdc8dddf04 6679:96e034508978