From: Joey Hess <joey@kitenet.net>
Date: Mon, 30 Aug 2010 18:47:57 +0000 (-0400)
Subject: Merge remote branch 'intrigeri/po'
X-Git-Tag: 3.20100831~33
X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=commitdiff_plain;h=931036eb5c2a26dd0f4bae1c6d9003b65ad890ff

Merge remote branch 'intrigeri/po'
---

931036eb5c2a26dd0f4bae1c6d9003b65ad890ff