From: Joey Hess Date: Tue, 19 Jul 2011 18:11:36 +0000 (-0400) Subject: Merge remote-tracking branch 'intrigeri/po' X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8512ae3ed5329a8aa69debc96f49eaa6dedeaae0;p=ikiwiki.git Merge remote-tracking branch 'intrigeri/po' --- 8512ae3ed5329a8aa69debc96f49eaa6dedeaae0