Comparison

plugins/muc/mod_muc.lua @ 6614:c78f8f8f4434

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Fri, 03 Apr 2015 06:39:28 +0200
parent 6479:d016437e01bf
child 6745:6728ad041761
comparison
equal deleted inserted replaced
6609:d2faaaca695d 6614:c78f8f8f4434