From: Joey Hess Date: Sat, 25 Dec 2010 16:35:25 +0000 (-0400) Subject: Merge remote branch 'intrigeri/po' X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c5f1c503cdac65a55e6a796c86fdcc9d0b9ad6d3;p=ikiwiki.git Merge remote branch 'intrigeri/po' --- c5f1c503cdac65a55e6a796c86fdcc9d0b9ad6d3