summaryrefslogtreecommitdiff
path: root/README
diff options
context:
space:
mode:
authorMichael Tänzer <neo@nhng.de>2013-11-06 03:18:30 +0100
committerMichael Tänzer <neo@nhng.de>2013-11-06 03:18:30 +0100
commit6238e3b56e965aeb8eaa3345af330e96714f3989 (patch)
tree1bfbcd4dce8e2aa36b1207193a284ca7bfdcae7f /README
parent654e5db51486c4da9941ba2c3b02b037c1918533 (diff)
parent234b43aca01ba78b9aff492591f84187ca12a664 (diff)
downloadcacert-devel-6238e3b56e965aeb8eaa3345af330e96714f3989.tar.gz
cacert-devel-6238e3b56e965aeb8eaa3345af330e96714f3989.tar.xz
cacert-devel-6238e3b56e965aeb8eaa3345af330e96714f3989.zip
Merge branch 'release' into bug-440
Conflicts: includes/account.php Signed-off-by: Michael Tänzer <neo@nhng.de>
Diffstat (limited to 'README')
0 files changed, 0 insertions, 0 deletions