From: intrigeri Date: Wed, 22 Dec 2010 11:54:18 +0000 (+0100) Subject: Merge remote branch 'upstream/master' into prv/po X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a8d733130e99c3b611605d2b3d0db9a9ca8f98f7;p=ikiwiki.git Merge remote branch 'upstream/master' into prv/po --- a8d733130e99c3b611605d2b3d0db9a9ca8f98f7