From: Amitai Schlair Date: Thu, 2 Feb 2012 03:07:03 +0000 (-0500) Subject: Merge branch 'master' into cvs X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f29c12422e92a58069e0f157d6e9c3ce6e859fee;p=ikiwiki.git Merge branch 'master' into cvs --- f29c12422e92a58069e0f157d6e9c3ce6e859fee