From: Joey Hess <joey@kitenet.net>
Date: Fri, 3 Jun 2011 16:36:30 +0000 (-0400)
Subject: Merge remote-tracking branch 'intrigeri/po'
X-Git-Tag: 3.20110431~18
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/50d2704db6fec29756e930d82aecca67802a063e?hp=50d2704db6fec29756e930d82aecca67802a063e

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