| commit | 5a30f220aae41c17082dbf40abee04966cc88338 | [log] [tgz] |
|---|---|---|
| author | Shawn Pearce <sop@google.com> | Fri Dec 06 23:43:21 2013 -0800 |
| committer | Shawn Pearce <sop@google.com> | Fri Dec 06 23:43:21 2013 -0800 |
| tree | 574e642fcf44656a0b348db2b3d313a1685e98e1 | |
| parent | b8dff0376abad609f9582d7903ee72cf724aeab7 [diff] | |
| parent | 9bf69d8690842d653ed18fed85ffcbc6ee523c03 [diff] |
Merge branch 'stable-2.8' * stable-2.8: Fix related changes after rebase