Diff - refs/heads/sprint70^2..refs/heads/sprint70 - osee/org.eclipse.ote - Git at Google

commit: 6a04cfba74de59fc5df76eb526176ca9ba2bbef4
[log]
author: Andy Jury <andy.jury@boeing.com>
Thu Jan 22 13:33:45 2015 -0700
committer: Andy Jury <andy.jury@boeing.com>
Thu Jan 22 13:33:45 2015 -0700
tree: 0b1d5f99f2c64be0b7a0ab8c074150953fcffd98
parent: 053513c4b8f6823aff64c10c0151dac88993ff5b [diff]
parent: 9db48e01e3524dde4e775122fce1fe617f410fd3 [diff]

Merge branch 'sprint68'