summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorMichael Tänzer <neo@nhng.de>2013-08-25 00:53:20 +0200
committerMichael Tänzer <neo@nhng.de>2013-08-25 00:53:20 +0200
commit4a3ba3b7c9525501bcbf71ad0ad048f5a99018b4 (patch)
treee7dfd2b1fbeecbcd129dc008ef352a966843d956 /includes
parentc34d0d386d2efb408cdc2dbd512a67ca259abea3 (diff)
parentb3f92f6473bc302bddb5efe7f3b6e200625cfacb (diff)
downloadcacert-devel-4a3ba3b7c9525501bcbf71ad0ad048f5a99018b4.tar.gz
cacert-devel-4a3ba3b7c9525501bcbf71ad0ad048f5a99018b4.tar.xz
cacert-devel-4a3ba3b7c9525501bcbf71ad0ad048f5a99018b4.zip
Merge branch 'bug-1123' into merge-bug-1177-893-1136-1123-1137
Conflicts: pages/account/10.php Signed-off-by: Michael Tänzer <neo@nhng.de>
Diffstat (limited to 'includes')
0 files changed, 0 insertions, 0 deletions