| commit | fef18bfcb02aa3ffb6ffb0cc13b9dace52de6bd2 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Sun Nov 15 14:39:53 2009 -0800 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Sun Nov 15 14:39:53 2009 -0800 |
| tree | 605ac452a52aa3fed0396e76be5c6a046384c0e9 | |
| parent | e3cfe2d92868513c9524804a362c3c3c8b8cc4e5 [diff] | |
| parent | 383aa124de2a830be83a4c90bdd8a3f3e03f05ae [diff] |
resolved conflicts for merge of 383aa124 to eclair-mr2