From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 29 Mar 2009 18:32:02 +0000 (-0400)
Subject: Merge commit 'origin/master' into po
X-Git-Tag: 3.15~193
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=9dee7d1554051ebe9b87d6dd778b8e97c69d7c2e;p=ikiwiki.git

Merge commit 'origin/master' into po
---

9dee7d1554051ebe9b87d6dd778b8e97c69d7c2e