From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 28 Aug 2009 23:48:32 +0000 (-0400)
Subject: Merge commit 'intrigeri/po'
X-Git-Tag: 3.1415926~10
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3811c5f5599f63a65d9b0c73451201514082e8ec;p=ikiwiki.git

Merge commit 'intrigeri/po'
---

3811c5f5599f63a65d9b0c73451201514082e8ec