Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Mon, 30 May 2016 11:30:53 +0000 (13:30 +0200)
committerKim Alvefur <zash@zash.se>
Mon, 30 May 2016 11:30:53 +0000 (13:30 +0200)
commit2b1dc0cc310168a2272e6e57268e1cae6f01af3c
treefc79959e83cc1424417471a792ef62fb4f55c20b
parentc18153e25135af31149458afbb695fa8e84f345f
parent59ded0b1e35dec21bd5e5207981f28e14e1051f9
Merge 0.10->trunk
plugins/mod_s2s/mod_s2s.lua