Diff

plugins/muc/history.lib.lua @ 6502:8fed6ea12098

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 26 Oct 2014 20:58:02 +0100
parent 6277:f2c9c36979b3
child 6535:0f940a7ba489
line wrap: on
line diff