From: intrigeri Date: Sun, 22 Aug 2010 09:09:37 +0000 (+0200) Subject: Merge remote branch 'upstream/master' into prv/po X-Git-Tag: 3.20100831~33^2 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e85c15e75bc7a24be537d905a53877f462c2d8cd;p=ikiwiki.git Merge remote branch 'upstream/master' into prv/po --- e85c15e75bc7a24be537d905a53877f462c2d8cd