From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 27 Aug 2009 19:51:55 +0000 (-0400)
Subject: Merge commit 'intrigeri/po'
X-Git-Tag: 3.1415926~42
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=023c3046c0d5d595fd92c535842bf05fb0da0955;p=ikiwiki.git

Merge commit 'intrigeri/po'
---

023c3046c0d5d595fd92c535842bf05fb0da0955