From: Joey Hess <joey@kodama.kitenet.net>
Date: Tue, 11 Nov 2008 22:52:32 +0000 (-0500)
Subject: Merge branch 'master' into po
X-Git-Tag: 3.15~342^2~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2a56ec664402e21625e9251dcbb3b53490e7ed0d;p=ikiwiki.git

Merge branch 'master' into po
---

2a56ec664402e21625e9251dcbb3b53490e7ed0d