summaryrefslogtreecommitdiff
path: root/locale/Makefile
diff options
context:
space:
mode:
authorMichael Tänzer <neo@nhng.de>2012-01-10 13:32:37 +0100
committerMichael Tänzer <neo@nhng.de>2012-01-10 13:32:37 +0100
commit923efbdb9d77f2976d2eb6584a1bb922c0cfaf90 (patch)
treeef816048edfdf64d07d33e4e5d55653db8ebdb00 /locale/Makefile
parentffeed4b555aa9c0088c43d1dbfbd810d3b177c01 (diff)
parent22fb084237713f5041def5161a2df884b1b24f74 (diff)
downloadcacert-devel-923efbdb9d77f2976d2eb6584a1bb922c0cfaf90.tar.gz
cacert-devel-923efbdb9d77f2976d2eb6584a1bb922c0cfaf90.tar.xz
cacert-devel-923efbdb9d77f2976d2eb6584a1bb922c0cfaf90.zip
Merge branch 'release' into bug-985bug-985
Conflicts: www/wot.php Signed-off-by: Michael Tänzer <neo@nhng.de>
Diffstat (limited to 'locale/Makefile')
0 files changed, 0 insertions, 0 deletions