diff options
| author | Michael Tänzer <neo@nhng.de> | 2012-12-11 22:53:58 +0100 |
|---|---|---|
| committer | Michael Tänzer <neo@nhng.de> | 2012-12-11 22:53:58 +0100 |
| commit | 854cc8de4d518923dd855352fd6b06aa0cfc189f (patch) | |
| tree | 42737c8ada45c82f1f5045d132ed5055a21dd6a1 /www/tverify | |
| parent | f7f8a436dc00dd1b57e295232f45027ecbfd18ee (diff) | |
| parent | 46af74ccb903b92ac6de768934a3faf8d2da45ea (diff) | |
| download | cacert-devel-854cc8de4d518923dd855352fd6b06aa0cfc189f.tar.gz cacert-devel-854cc8de4d518923dd855352fd6b06aa0cfc189f.tar.xz cacert-devel-854cc8de4d518923dd855352fd6b06aa0cfc189f.zip | |
Merge branch 'release' into testserver-mods
Conflicts:
www/cats/cats_import.php
Signed-off-by: Michael Tänzer <neo@nhng.de>
Diffstat (limited to 'www/tverify')
0 files changed, 0 insertions, 0 deletions