From: Joey Hess Date: Sun, 6 Nov 2011 19:57:24 +0000 (-0400) Subject: Merge remote-tracking branch 'origin/master' X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=bf8b3bc12abe9d763329a191bdb152b30978d2ef;p=ikiwiki.git Merge remote-tracking branch 'origin/master' --- bf8b3bc12abe9d763329a191bdb152b30978d2ef