comparison plugins/muc/history.lib.lua @ 7179:bfa3b2ee384c

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Mon, 22 Feb 2016 15:24:20 +0100
parents 6cc7c9da29ed
children 24e2369b67f9
comparison
equal deleted inserted replaced
7171:91d36a37a9ff 7179:bfa3b2ee384c