Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Sat, 25 Apr 2015 22:07:36 +0000 (00:07 +0200)
committerKim Alvefur <zash@zash.se>
Sat, 25 Apr 2015 22:07:36 +0000 (00:07 +0200)
commit5fc589b5a2e0226b2ec6e70c4a1ba19bf17016e8
tree881715925fd4b6187e736807cab32afdd7f5dbbb
parenta34a6a11c8e2124e854414e18b8e8df1b85bcb7a
parent0ee742019c5a7a86de6fbaf98db2c737c5ce41a9
Merge 0.10->trunk
plugins/mod_s2s/mod_s2s.lua