# HG changeset patch # User Matthew Wild <mwild1@gmail.com> # Date 1378207938 -3600 # Node ID 441876452b9c6249d3842660213e5ffa0e009760 # Parent 5733a277237adab8c7f709b06e9b5117bd237bd7# Parent 20e2b588f8c25e0d4996410fc2930c621599584f Merge 0.9->trunk diff -r 5733a277237a -r 441876452b9c core/certmanager.lua