summaryrefslogtreecommitdiff
path: root/pages
diff options
context:
space:
mode:
authorBenny Baumann <BenBE@geshi.org>2013-06-11 21:44:14 +0200
committerBenny Baumann <BenBE@geshi.org>2013-06-11 21:44:14 +0200
commit0913b852c9e7a335cc2700f6f7d573565218c9dc (patch)
treec796f5c21c8cbb75ba96d8c080b0bb804688213a /pages
parent7576822c55bb625194481bc2da8748c11969d843 (diff)
parenta11db8f489b85b66da3dbe42824d1491054356b7 (diff)
downloadcacert-devel-0913b852c9e7a335cc2700f6f7d573565218c9dc.tar.gz
cacert-devel-0913b852c9e7a335cc2700f6f7d573565218c9dc.tar.xz
cacert-devel-0913b852c9e7a335cc2700f6f7d573565218c9dc.zip
Merge branch 'bug-1137' into testserver-stable
Conflicts: www/wot.php
Diffstat (limited to 'pages')
0 files changed, 0 insertions, 0 deletions