Merge branch 'jk/daemon-msgs'

* jk/daemon-msgs: daemon: give friendlier error messages to clients Conflicts: daemon.c

Junio C Hamano committed Oct 21, 2011 at 16:04 UTC e75a59adfcc4fd048690e5b25f9a8c31d8011d53

No changes.