From: Joey Hess <joey@kitenet.net>
Date: Sun, 18 Jul 2010 23:35:16 +0000 (-0400)
Subject: Merge remote branch 'intrigeri/po'
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/b45688e34e25a596dc19f6a2b94f3f342041da1e

Merge remote branch 'intrigeri/po'
---

b45688e34e25a596dc19f6a2b94f3f342041da1e