Merge 0.9->0.10
authorKim Alvefur <zash@zash.se>
Wed, 13 May 2015 20:31:59 +0000 (22:31 +0200)
committerKim Alvefur <zash@zash.se>
Wed, 13 May 2015 20:31:59 +0000 (22:31 +0200)
commit774d985d6a690539af5086956f2c9fb89c41ad26
treea043c00b2e4e0c0e4c5f820469b0844bd0964b72
parent184be52d7f3df81e91140e6a27f658456aa88d4a
parentfbac75f002c7fd1e220c997637fa806d008d6521
Merge 0.9->0.10
plugins/mod_s2s/mod_s2s.lua
plugins/mod_s2s/s2sout.lib.lua