From: Joey Hess <joey@kitenet.net>
Date: Thu, 21 Apr 2011 18:18:02 +0000 (-0400)
Subject: Merge remote-tracking branch 'jon/silence-generated'
X-Git-Tag: 3.20110430~21
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/d0b5b8bcb412f9f169f2320623bd516afb34413b?hp=d0b5b8bcb412f9f169f2320623bd516afb34413b

Merge remote-tracking branch 'jon/silence-generated'
---