comparison plugins/muc/subject.lib.lua @ 6285:ea60d0441df7

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sat, 21 Jun 2014 15:05:52 +0200
parents f2c9c36979b3
children 675aea867574
comparison
equal deleted inserted replaced
6278:fcc3ef191293 6285:ea60d0441df7