Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Tue, 26 Jan 2016 13:15:38 +0000 (14:15 +0100)
committerKim Alvefur <zash@zash.se>
Tue, 26 Jan 2016 13:15:38 +0000 (14:15 +0100)
commit6361d13806347a826bea100bdb50563b012bad99
treed228be4437437e7e34c37ee59e16dbe3a50348b9
parent36c567ebc96fc65b364b348d8603412bd127b856
parentea83efae5b3356534f19799f67e97f6f4555adf9
Merge 0.10->trunk
plugins/mod_s2s/mod_s2s.lua