both changes picked

[ikiwiki.git] / doc / plugins / po.mdwn

diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index 3b152586e57a8a453faee00ea6a41248d9ab6241..fdef41e454936b3b01a22ae649ed2a4c9c3197c4 100644 (file)
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -330,6 +330,8 @@ This code favors the type of the linking page's masterpage on page
 creation (when `from=page.LL`). This is commit c9301d2c296f682.
 --[[intrigeri]]
 
+> Both cherry picked. --[[Joey]] 
+
 Documentation
 -------------