summaryrefslogtreecommitdiff
path: root/tmp/Makefile
diff options
context:
space:
mode:
authorMichael Tänzer <neo@nhng.de>2011-03-16 00:05:22 +0100
committerMichael Tänzer <neo@nhng.de>2011-03-16 00:05:22 +0100
commit12205be01944d2b1c124963cff1dd26ef6333ea9 (patch)
tree723e2266202724d334ce994e6e0e9367ae10bd99 /tmp/Makefile
parent6008db0778c3c8b394a6fc5a65b2fa0aeb7189aa (diff)
parentd48e21cdb270945083df222ea16720a0e279a3c0 (diff)
downloadcacert-devel-12205be01944d2b1c124963cff1dd26ef6333ea9.tar.gz
cacert-devel-12205be01944d2b1c124963cff1dd26ef6333ea9.tar.xz
cacert-devel-12205be01944d2b1c124963cff1dd26ef6333ea9.zip
Merge branch 'bug-896' into release2011-03-16
Conflicts: locale/ru.po
Diffstat (limited to 'tmp/Makefile')
0 files changed, 0 insertions, 0 deletions