Merge 0.9->0.10
authorKim Alvefur <zash@zash.se>
Tue, 26 Jan 2016 13:15:00 +0000 (14:15 +0100)
committerKim Alvefur <zash@zash.se>
Tue, 26 Jan 2016 13:15:00 +0000 (14:15 +0100)
commitea83efae5b3356534f19799f67e97f6f4555adf9
treeb7415e134cac120c18da5aad097c28ea89f8975a
parent3649d951aa384ebe81c156c692438ff6fc318dff
parente2289a8cbb284078dbe244d7844ea7f79cdbc157
Merge 0.9->0.10
plugins/mod_c2s.lua
plugins/mod_s2s/mod_s2s.lua