From: Anonymous <anonymous@none>
Date: Tue, 26 Oct 2010 15:57:58 +0000 (+0200)
Subject: Merge remote branch 'remotes/origin/master'
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c2f01e320df8a27c0ac16fb38fba099925dbd010;p=ikiwiki.git

Merge remote branch 'remotes/origin/master'
---

c2f01e320df8a27c0ac16fb38fba099925dbd010