From: Joey Hess Date: Thu, 21 Apr 2011 18:18:02 +0000 (-0400) Subject: Merge remote-tracking branch 'jon/silence-generated' X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d0b5b8bcb412f9f169f2320623bd516afb34413b;p=ikiwiki.git Merge remote-tracking branch 'jon/silence-generated' --- d0b5b8bcb412f9f169f2320623bd516afb34413b