Merge timber->trunk - thanks everyone!
authorMatthew Wild <mwild1@gmail.com>
Tue, 24 Apr 2012 20:59:20 +0000 (21:59 +0100)
committerMatthew Wild <mwild1@gmail.com>
Tue, 24 Apr 2012 20:59:20 +0000 (21:59 +0100)
commit3b635da220bdbe28712f7007be430eb6e1283912
tree734f21bb5fb1334e1c40ceea6ee22da156436874
parentdb0e221e461a451f5024e30c9740f958ae339781
parent122a9eb130561fd0298cb138ca899aebfa31ab64
Merge timber->trunk - thanks everyone!
core/s2smanager.lua
plugins/mod_admin_telnet.lua
plugins/mod_bosh.lua
util/debug.lua