summaryrefslogtreecommitdiff
path: root/csr
diff options
context:
space:
mode:
authorBenny Baumann <BenBE@geshi.org>2013-06-11 22:33:34 +0200
committerBenny Baumann <BenBE@geshi.org>2013-06-11 22:33:34 +0200
commit216271b2501cba5ac2724c56588fa62c725d1d69 (patch)
tree92ac053ba899c2195f411eff5bd8d01cb869c337 /csr
parent0913b852c9e7a335cc2700f6f7d573565218c9dc (diff)
parentf0318d79dbc69e444fee4c085cdb3ee152318e1c (diff)
downloadcacert-devel-216271b2501cba5ac2724c56588fa62c725d1d69.tar.gz
cacert-devel-216271b2501cba5ac2724c56588fa62c725d1d69.tar.xz
cacert-devel-216271b2501cba5ac2724c56588fa62c725d1d69.zip
Merge branch 'bug-1162' into testserver-stable
Conflicts: www/wot.php
Diffstat (limited to 'csr')
0 files changed, 0 insertions, 0 deletions