projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 454a3cd d922411)
Merge 0.9->trunk
authorMatthew Wild <mwild1@gmail.com>
Wed, 12 Jun 2013 23:09:56 +0000 (00:09 +0100)
committerMatthew Wild <mwild1@gmail.com>
Wed, 12 Jun 2013 23:09:56 +0000 (00:09 +0100)
1  2 
core/certmanager.lua patch | diff1 | diff2 | blob | history

diff --cc core/certmanager.lua
Simple merge