comparison plugins/muc/history.lib.lua @ 6347:e1a7ccd82fce

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 10 Aug 2014 10:31:18 +0200
parents f2c9c36979b3
children 0f940a7ba489
comparison
equal deleted inserted replaced
6343:e6839156bb82 6347:e1a7ccd82fce