tree 94c59c66fe238b0d9010a53f8a81f51dcde60907
parent 1893323eabbd0437e4d6cc1245491b4bc2b3bb0d
parent 96a34d2a1bddb2198c3c99d840f64d1ed1f8c670
author Kenn Hussey <Kenn.Hussey@gmail.com> 1382321206 -0400
committer Kenn Hussey <Kenn.Hussey@gmail.com> 1382321206 -0400

Merge branch 'master' into bugs/401682

Conflicts:
	tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/bug/tests/UMLBugTests.java