From: Joey Hess Date: Sat, 24 Apr 2010 20:46:30 +0000 (-0400) Subject: Merge branch 'master' into templatemove X-Git-Tag: 3.20100427~20 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4321b301398f6e5e034bfb7b1ab5a996d42ddbb5;p=ikiwiki.git Merge branch 'master' into templatemove --- 4321b301398f6e5e034bfb7b1ab5a996d42ddbb5