From: intrigeri <intrigeri@boum.org>
Date: Fri, 7 Nov 2008 21:55:09 +0000 (+0100)
Subject: Merge branch 'prv/po' into pub/po
X-Git-Tag: 3.15~381
X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=commitdiff_plain;h=cdd3d2416b9f1ce2000f44bd7d868524c6af6102

Merge branch 'prv/po' into pub/po
---

cdd3d2416b9f1ce2000f44bd7d868524c6af6102