| commit | a5a8cc13d3f906650a1eb17e20e1b26d68b78453 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Thu Dec 10 17:53:27 2009 -0800 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Thu Dec 10 17:53:27 2009 -0800 |
| tree | 656976c8ca4d5a7c096119a3e087770651c3009c | |
| parent | 7b0463a949b57620680b95e45c66a05f67426b74 [diff] | |
| parent | ce307f889b509143899a2221359219fbc91b618c [diff] |
resolved conflicts for merge of ce307f88 to eclair-mr2