summaryrefslogtreecommitdiff
path: root/doc/plugins
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2008-11-13 04:39:53 +0100
committerintrigeri <intrigeri@boum.org>2008-11-13 04:39:53 +0100
commit3190e5cea75a43d38f58b8a45fbc87d5527d18f0 (patch)
tree8f305a6db081f7832c7feaa4b8322cefdfc26cbc /doc/plugins
parent5eed0fd97d3f1abcfce3288df9aeeed50967757c (diff)
parent699aa79c2e2dbec02a38ba6ff32e9c861ee9f7be (diff)
Merge commit 'upstream/master' into prv/po
Diffstat (limited to 'doc/plugins')
-rw-r--r--doc/plugins/contrib/po.mdwn2
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/plugins/contrib/po.mdwn b/doc/plugins/contrib/po.mdwn
index 3077b4858..0fd06cb81 100644
--- a/doc/plugins/contrib/po.mdwn
+++ b/doc/plugins/contrib/po.mdwn
@@ -158,3 +158,5 @@ Any thoughts on this?
>>>>> Joey, please have a look at my branch, your help would be really
>>>>> welcome for the security research, as I'm almost done with what
>>>>> I am able to do myself in this area. --[[intrigeri]]
+>>>>>>
+>>>>>> I came up with a patch for the WrapI18N issue --[[Joey]]