Merge branch 'master' of ssh://git.eclipse.org/gitroot/orion/org.eclipse.orion.client, util.js conflict
tree: aa37de32245c8c4c940922297aa28babfc6bbb5d
  1. README
  2. bundles/