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

Merge remote branch 'intrigeri/po'
---

c5f1c503cdac65a55e6a796c86fdcc9d0b9ad6d3