Merge 0.10->trunk
authorMatthew Wild <mwild1@gmail.com>
Wed, 6 May 2015 18:26:53 +0000 (19:26 +0100)
committerMatthew Wild <mwild1@gmail.com>
Wed, 6 May 2015 18:26:53 +0000 (19:26 +0100)
commit10b02ae28be2af2bf925b542509eccb82a5d1db1
treebb8eec1aa07718fb9e604595b2437d7072e93c63
parente13f56993ab9fccd30fb6273f9b33d78d50ea0df
parentcff6734d1cfe7b437f09ccbdbb1c103ec03b7ce4
Merge 0.10->trunk
core/moduleapi.lua
core/storagemanager.lua
plugins/mod_s2s/mod_s2s.lua