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

Merge commit 'intrigeri/po'
---

c68413dccecfb303f8cfc803672bf132af025968