Merge 0.8->trunk
authorMatthew Wild <mwild1@gmail.com>
Tue, 7 Jun 2011 00:29:34 +0000 (01:29 +0100)
committerMatthew Wild <mwild1@gmail.com>
Tue, 7 Jun 2011 00:29:34 +0000 (01:29 +0100)
commitdbaf733912c1504f695c3671a5d2e253e826871e
treef4e2aceabef05eb030d1bed8180b9d2a681c9eba
parent03155b96e17626e8b93a7834c0500133730e064a
parent2eca719b5e68a5a4bdf29daa51896f08a3ffaacf
Merge 0.8->trunk
plugins/mod_bosh.lua
plugins/mod_dialback.lua