42534fce20006a40b7330468a87b4424f49463cd - gerrit/eclipselink/eclipselink.utils.temp

commit: 42534fce20006a40b7330468a87b4424f49463cd
[log]
author: johnbracken <john.b.bracken@oracle.com>
Sun Jan 27 14:00:26 2013 -0800
committer: johnbracken <john.b.bracken@oracle.com>
Sun Jan 27 14:00:26 2013 -0800
tree: 040293de91cf49b67703e2722464dfedf5015435
parent: ae47dc9b5eb23f174b98579b997d365aaf36b1f4 [diff]
parent: b094bd8021414215bc44bdf9fc90c798409a4f93 [diff]

Merge branch 'master' of ssh://git.eclipse.org/gitroot/eclipselink/eclipselink.utils.temp

Conflicts:
	tools/org.eclipse.persistence.tools.gen.db/resource/templates/xml_entities/main.xml.vm

tree: 040293de91cf49b67703e2722464dfedf5015435

tools/
.gitignore
antbuild.xml