Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Fri, 8 Jul 2016 13:12:44 +0000 (15:12 +0200)
committerKim Alvefur <zash@zash.se>
Fri, 8 Jul 2016 13:12:44 +0000 (15:12 +0200)
commit0ca860005cbdd6841778076c1c22fd324f7f58b8
treeb040a50088804b06231e6b6a43f7ddd384f1b7c8
parenta1c272e4c48e807e798444a369700cfd1f0ab755
parent00ad349fba0c2e095fd24eb8a531221d18b01a3d
Merge 0.10->trunk
plugins/mod_c2s.lua
plugins/mod_s2s/mod_s2s.lua