| commit | dbc4a919b8213bc91db4af6ae0637ddc72775d90 | [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 | 2be5aacbe410439b4a1d5ce6fff5c769c2e6680c | |
| parent | a26458ad6e9f489904cccd18c0be80473d78a0db [diff] | |
| parent | 7b563c23dcdc22028128d42d81d5f93250e543ce [diff] |
resolved conflicts for merge of 383aa124 to eclair-mr2