From: intrigeri Date: Thu, 26 May 2011 15:12:43 +0000 (+0200) Subject: Merge remote branch 'upstream/master' into anonpush X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4f609f457dd99ece54c36e92acc94fa2e9db3498;p=ikiwiki.git Merge remote branch 'upstream/master' into anonpush --- 4f609f457dd99ece54c36e92acc94fa2e9db3498