From: Joey Hess Date: Fri, 3 Jun 2011 16:36:30 +0000 (-0400) Subject: Merge remote-tracking branch 'intrigeri/po' X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=50d2704db6fec29756e930d82aecca67802a063e;p=ikiwiki.git Merge remote-tracking branch 'intrigeri/po' --- 50d2704db6fec29756e930d82aecca67802a063e