From: Joey Hess <joey@kitenet.net>
Date: Sun, 18 Jul 2010 23:35:16 +0000 (-0400)
Subject: Merge remote branch 'intrigeri/po'
X-Git-Tag: 3.20100722~8^2~8
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b45688e34e25a596dc19f6a2b94f3f342041da1e;p=ikiwiki.git

Merge remote branch 'intrigeri/po'
---

b45688e34e25a596dc19f6a2b94f3f342041da1e