Merge 0.9->trunk
authorMatthew Wild <mwild1@gmail.com>
Tue, 11 Jun 2013 20:50:41 +0000 (21:50 +0100)
committerMatthew Wild <mwild1@gmail.com>
Tue, 11 Jun 2013 20:50:41 +0000 (21:50 +0100)
commit454a3cd294ebd25dd18a38785a0040ab8f4b77fd
treec51d8ffa4e8597e84b0c52085436b11f47d906f6
parent2846e76a1b17530dc8d5c3cb3a192917863f0554
parentd6d9a7ee23e14e8b629c12789f6b2d3d7b9ca870
Merge 0.9->trunk
core/certmanager.lua