Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Sun, 11 Oct 2015 18:03:00 +0000 (20:03 +0200)
committerKim Alvefur <zash@zash.se>
Sun, 11 Oct 2015 18:03:00 +0000 (20:03 +0200)
1  2 
plugins/mod_s2s/mod_s2s.lua

Simple merge