From: Joey Hess Date: Fri, 7 May 2010 17:25:56 +0000 (-0400) Subject: Merge branch 'master' into commentreorg X-Git-Tag: 3.20100515~71 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=911184432d1ccbeb1bcee224efba99f558ba74d5;p=ikiwiki.git Merge branch 'master' into commentreorg --- 911184432d1ccbeb1bcee224efba99f558ba74d5