From: intrigeri <intrigeri@boum.org>
Date: Thu, 6 Nov 2008 15:30:49 +0000 (+0100)
Subject: Merge branch 'pub/po' into pub/master
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/e3b04285cec28cc3ab02270a5697dd7812b93927?hp=-c

Merge branch 'pub/po' into pub/master
---

e3b04285cec28cc3ab02270a5697dd7812b93927