Christopher Tate 07c71147dd am 09f82ec6: am af1255da: resolved conflicts for merge of 2624fbca to eclair-mr2 ...

Merge commit '09f82ec61cca00bd8b08529a94139dd6ac5cec73'

* commit '09f82ec61cca00bd8b08529a94139dd6ac5cec73':
  Fix #2320798: Device hang then runtime restart

2009-12-11 13:26:05 -08:00

..

server

am 09f82ec6: am af1255da: resolved conflicts for merge of 2624fbca to eclair-mr2

2009-12-11 13:26:05 -08:00