# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1378208619 -7200
# Node ID 7974683a9bb7e636525ed163b9de27d6939ba4cb
# Parent  441876452b9c6249d3842660213e5ffa0e009760# Parent  6bc4077bc1f96ff83795fcc423ff270a28156d1c
Merge 0.9->trunk

diff -r 441876452b9c -r 7974683a9bb7 core/certmanager.lua