From: Joey Hess <joey@kitenet.net>
Date: Tue, 19 Jul 2011 18:11:36 +0000 (-0400)
Subject: Merge remote-tracking branch 'intrigeri/po'
X-Git-Tag: 3.20110905~131
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/8512ae3ed5329a8aa69debc96f49eaa6dedeaae0?hp=-c

Merge remote-tracking branch 'intrigeri/po'
---

8512ae3ed5329a8aa69debc96f49eaa6dedeaae0