From: intrigeri <intrigeri@boum.org>
Date: Thu, 26 May 2011 15:12:43 +0000 (+0200)
Subject: Merge remote branch 'upstream/master' into anonpush
X-Git-Tag: 3.20110431~34
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/4f609f457dd99ece54c36e92acc94fa2e9db3498

Merge remote branch 'upstream/master' into anonpush
---

4f609f457dd99ece54c36e92acc94fa2e9db3498