Merge branch 'fleischer-dc17'
commitfeaf3339dd1f6c23cba93d66c5dcf0c2bda280bf
authorChristopher Davis <chrisd@mangrin.org>
Sun, 17 Jan 2010 23:14:51 +0000 (17 15:14 -0800)
committerChristopher Davis <chrisd@mangrin.org>
Sun, 17 Jan 2010 23:14:51 +0000 (17 15:14 -0800)
tree474c982941518923ab9a363530effa37d00c823a
parent193d95e3906967433081e0b10626a67c075ac131
parentb77065f150546a29a92ac468dbaed88aaf53a9b4
Merge branch 'fleischer-dc17'
client.c