| commit | ec92c065073c4629f14ace923c9ec316e717649d | [log] [tgz] |
|---|---|---|
| author | Vitaly Buka <vitalybuka@google.com> | Thu Oct 22 14:17:33 2015 -0700 |
| committer | Vitaly Buka <vitalybuka@google.com> | Thu Oct 22 14:17:33 2015 -0700 |
| tree | e53fd2a28f716a5b51d5cf1db88294a066cbfe79 | |
| parent | e002ee11bbf136fa5c938031e2d843ac78141ed5 [diff] | |
| parent | e07c29d604d1b1c3a179f40140934a806bd9a425 [diff] |
git merge --no-ff remotes/weave/master Change-Id: I15f4cbdaaedeeebceb69631265ce3b7862876405