# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1384223009 0
# Node ID 99bf636fce466210e7a5d0dfa1dc28c46854c1c4
# Parent  eda2556aa1397957f313d174924f2bc296782e85# Parent  1c4405f33561f45cc7f8804b76dc6d1a39eb35aa
Merge 0.10->trunk

diff -r eda2556aa139 -r 99bf636fce46 core/certmanager.lua