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-Tag: 3.15~382
X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=commitdiff_plain;h=f652af11fd591bb3905d25a6653a0aca25d85e4a

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

f652af11fd591bb3905d25a6653a0aca25d85e4a