| commit | 58ac43f652b8eded180f67c22ff655b66f790ae1 | [log] [tgz] |
|---|---|---|
| author | mgolubev <golubev@montages.com> | Tue May 29 23:54:56 2012 +0200 |
| committer | mgolubev <golubev@montages.com> | Tue May 29 23:54:56 2012 +0200 |
| tree | cfbe75015fcec438666229f18f9421d3503a69a1 | |
| parent | 1d33cecb04ca7639131dcacd6c8032e4cc4800e8 [diff] | |
| parent | a5e2779af0de5c552b41bb6e5b17697a6a193403 [diff] |
Merge branch '380186-bridge-trace-version-conflict'