From: Joey Hess <joey@kodama.kitenet.net>
Date: Tue, 11 Nov 2008 22:52:51 +0000 (-0500)
Subject: Merge commit 'intrigeri/po' into po
X-Git-Tag: 3.15~342^2~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0d1593a201f8492b6aea74e74d6b163c1ec70c3f;p=ikiwiki.git

Merge commit 'intrigeri/po' into po
---

0d1593a201f8492b6aea74e74d6b163c1ec70c3f