tree ae580a10f3917d91b96f1b8ac9fc885a558b6eed
parent cf85804cd634beb5a1d1899293b95f3300455303
parent 3656c02a796cd4829c84e3e463b077376fe715fe
author Bob Brodt <bbrodt@redhat.com> 1355871253 -0700
committer Bob Brodt <bbrodt@redhat.com> 1355871253 -0700

Merge branch 'develop' of ssh://git.eclipse.org:29418/bpel/org.eclipse.bpel into develop

Conflicts:
	.gitignore