tree 3d71aedff8cf8951d93c5c215860c5a305021e56
parent 0b06a7d20b188f230ccbed67614cf160217e485d
parent 0b06a7d20b188f230ccbed67614cf160217e485d
author Kenn Hussey <kenn.hussey@gmail.com> 1475073162 -0400
committer Kenn Hussey <kenn.hussey@gmail.com> 1475073162 -0400

Merge branch 'master' of
ssh://khussey@git.eclipse.org/gitroot/www.eclipse.org/modeling/mdt.git

Conflicts:
	downloads/hidden.txt