Merge remote-tracking branch 'jon/silence-generated'
commitd0b5b8bcb412f9f169f2320623bd516afb34413b
authorJoey Hess <joey@kitenet.net>
Thu, 21 Apr 2011 18:18:02 +0000 (21 14:18 -0400)
committerJoey Hess <joey@kitenet.net>
Thu, 21 Apr 2011 18:18:02 +0000 (21 14:18 -0400)
tree6e4fbdb6748abf029378ce00c59350eef6423d49
parent979dda9a94ec0665c7edd7e0ae35731ffca9ebdc
parentb7a49ee36479a00208ee80343fc3fc2be2da92fb
Merge remote-tracking branch 'jon/silence-generated'