From: intrigeri <intrigeri@boum.org>
Date: Fri, 7 Nov 2008 21:19:34 +0000 (+0100)
Subject: Merge commit 'upstream/master' into pub/po
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/f652af11fd591bb3905d25a6653a0aca25d85e4a

Merge commit 'upstream/master' into pub/po
---

f652af11fd591bb3905d25a6653a0aca25d85e4a