| commit | 5c52119414dd3dd6a4c760d1bea8113aeefea85f | [log] [tgz] |
|---|---|---|
| author | Shawn O. Pearce <sop@google.com> | Mon Jun 20 08:16:45 2011 -0700 |
| committer | Shawn O. Pearce <sop@google.com> | Mon Jun 20 08:16:45 2011 -0700 |
| tree | 8bf34b6dad02916972ff9d77d5f5c7ebf6ab1c06 | |
| parent | 24a798ca39d5c4fd79a52622422a5ec788154bf4 [diff] | |
| parent | 587084d19ff57808c77c62b6b7849ef11e17842e [diff] |
Merge branch 'stable' * stable: Don't delete values from MySQL sequence tables Conflicts: pom.xml Change-Id: I55e6e676fc339ea4c38dc0bafa4c2cbbb5baf43d