From: intrigeri <intrigeri@boum.org>
Date: Tue, 27 Jan 2009 18:35:38 +0000 (+0100)
Subject: po/todo: drop a note about my meta-po branch
X-Git-Tag: 3.15~214
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0314ed459ba1c49fad9170a54cc05f1c9e9c96bf;p=ikiwiki.git

po/todo: drop a note about my meta-po branch

Signed-off-by: intrigeri <intrigeri@boum.org>
---

diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index cdf3c6abe..756012890 100644
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -269,6 +269,9 @@ pages. Both were implemented, and reverted in commit
 ea753782b222bf4ba2fb4683b6363afdd9055b64, which should be reverted
 once [[intrigeri]]'s `meta` branch is merged.
 
+An integration branch, called `meta-po`, merges [[intrigeri]]'s `po`
+and `meta` branches, and thus has thise additional features.
+
 Robustness tests
 ----------------