diff options
| author | Michael Tänzer <neo@nhng.de> | 2011-04-11 20:15:06 +0200 |
|---|---|---|
| committer | Michael Tänzer <neo@nhng.de> | 2011-04-11 20:15:06 +0200 |
| commit | a3d7949c04a06539a8a0982968f711b7832d8672 (patch) | |
| tree | 4c2caa33b5fcf716d455fec60d38590cfffd5cdb /includes/general_stuff.php | |
| parent | e4d11212850f9835c31fa39e70f2422a9118df08 (diff) | |
| parent | b6f8838f587d48502c78d7ed70d768b989ef85fa (diff) | |
| download | cacert-devel-a3d7949c04a06539a8a0982968f711b7832d8672.tar.gz cacert-devel-a3d7949c04a06539a8a0982968f711b7832d8672.tar.xz cacert-devel-a3d7949c04a06539a8a0982968f711b7832d8672.zip | |
Merge branch 'tarballs' into release
Conflicts:
password.dat.sample
Signed-off-by: Michael Tänzer <neo@nhng.de>
Diffstat (limited to 'includes/general_stuff.php')
0 files changed, 0 insertions, 0 deletions