Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Thu, 24 Sep 2015 18:15:19 +0000 (20:15 +0200)
committerKim Alvefur <zash@zash.se>
Thu, 24 Sep 2015 18:15:19 +0000 (20:15 +0200)
commit079005505a7684fc55c77ab2f2fc717978e96b3e
tree5e96dd4c82f6f8e92f64286ad40fa30dc0c41110
parentdf9c5926142b6a32e0eaf959a6ba42457df24742
parente511b0d92738aeaeb8d81cf29247bd5d54a95b45
Merge 0.10->trunk
plugins/mod_s2s/mod_s2s.lua