Comparison

plugins/muc/history.lib.lua @ 7441:df1be36f87b1

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Wed, 25 May 2016 21:35:09 +0200
parent 7401:e16b3fd0bd80
child 8027:c2e7dfd87abb
comparison
equal deleted inserted replaced
7438:6bf4c227c8f3 7441:df1be36f87b1