From: Joey Hess <joey@kodama.kitenet.net>
Date: Wed, 5 Nov 2008 18:50:26 +0000 (-0500)
Subject: Merge commit 'intrigeri/po'
X-Git-Tag: 3.15~403^2~11
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=127a8a3701dd41285f0f989546f758f93ee53dba;p=ikiwiki.git

Merge commit 'intrigeri/po'
---

127a8a3701dd41285f0f989546f758f93ee53dba