From: Joey Hess <joey@kitenet.net>
Date: Sat, 24 Jul 2010 09:22:33 +0000 (-0400)
Subject: Merge remote branch 'intrigeri/po'
X-Git-Tag: 3.20100804~25
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=52f09a63a1b5715e3b8f364ebf3518cd1cf27b26;p=ikiwiki.git

Merge remote branch 'intrigeri/po'
---

52f09a63a1b5715e3b8f364ebf3518cd1cf27b26