Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Thu, 25 Jun 2015 16:57:43 +0000 (18:57 +0200)
committerKim Alvefur <zash@zash.se>
Thu, 25 Jun 2015 16:57:43 +0000 (18:57 +0200)
commit893fc70668bf474959354512e879812665814ea9
treeeb288d125cd90c88713a4b549062dadc0e0fdc9c
parent12909a656ed52b0bc6820584e971d85f0a536e41
parentf6b3f550857678d676b31c5338f4bc6a93df1339
Merge 0.10->trunk
plugins/mod_storage_sql2.lua
plugins/muc/mod_muc.lua