Merge branch 'jk/daemon-msgs' into next
commit415cf53e710b2ff44d485e253bb35a1ca5dff636
authorJunio C Hamano <gitster@pobox.com>
Sun, 16 Oct 2011 04:25:41 +0000 (15 21:25 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 16 Oct 2011 04:25:41 +0000 (15 21:25 -0700)
treee39ad490ddf4434a00851489b40081927bd30504
parentfbc2ee63c702a526d1a4cb5c2c5c2b4095746cdc
parentd5570f4d2cb29f3db9f69ff5fcde0a7d54ad2696
Merge branch 'jk/daemon-msgs' into next

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

Conflicts:
daemon.c
daemon.c