From: intrigeri Date: Mon, 26 Jan 2009 21:51:50 +0000 (+0100) Subject: Merge commit 'upstream/master' into prv/po X-Git-Tag: 3.15~228 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fcaa7f6237ac2b2b372cb26aed136f8a364d6ed5;p=ikiwiki.git Merge commit 'upstream/master' into prv/po --- fcaa7f6237ac2b2b372cb26aed136f8a364d6ed5