Merge 0.9->trunk
authorMatthew Wild <mwild1@gmail.com>
Sat, 13 Jul 2013 12:17:53 +0000 (13:17 +0100)
committerMatthew Wild <mwild1@gmail.com>
Sat, 13 Jul 2013 12:17:53 +0000 (13:17 +0100)
commit5a268f4d0caa5b7c992de490cdf4b876ef5c2006
treee2da498874105e20562434bc06ff9f1343985b84
parent1800311c7a881012b8c00c0717d53baf7380f388
parente92ed79732defae2ad4c12ca6f71d848701b0d07
Merge 0.9->trunk
core/certmanager.lua