# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1384222982 0
# Node ID 1c4405f33561f45cc7f8804b76dc6d1a39eb35aa
# Parent  6865eecaf5a5d85373acb5fd8e58e914bebc78c9# Parent  e6fed1d80116a62cd6eec94c7111552548dffddc
Merge 0.9->0.10

diff -r 6865eecaf5a5 -r 1c4405f33561 core/certmanager.lua