| commit | bf6bb50f3119054d9f6f2614c6b5bf37d8819b04 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Fri Jun 24 08:48:31 2011 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Fri Jun 24 08:48:31 2011 -0700 |
| tree | 79b7fe9f2727d41c96ea6b68bea3949643cb82de | |
| parent | 96ceeaf69785a05634fce17728066d69eef35944 [diff] |
Revert "resolved conflicts for merge of 972433bd to master" This reverts commit 5d0ec1aebb952601d98c2dad70ef369f75f2b44a, reversing changes made to 4839e47309ccefc41d4e7055f701104995472723.