| commit | 53f45f0367d9563278f427db106736dcd1a433d1 | [log] [tgz] |
|---|---|---|
| author | Andreas Huber <andih@google.com> | Thu Nov 12 10:32:26 2009 -0800 |
| committer | Andreas Huber <andih@google.com> | Thu Nov 12 10:32:26 2009 -0800 |
| tree | 7e7a696b98534e1699696227a4159b6592f2f937 | |
| parent | ca4bea0965f870c7d1d92357d860f50c6c18d51d [diff] | |
| parent | 1dfc99f22fb9d8c798065938c24eeb4eb9691747 [diff] |
resolved conflicts for merge of c66d53f9 to eclair-mr2