Recompiled the diff library with java 6. This fixes issue slisson/mps-richtext#30
Merge branch 'master' of github.com:slisson/mps-multiline
migrated to MPS 3.1 EAP
Merge branch 'master' into 31_EAP
updated build scripts
updated build scripts
Merge branch 'master' into 31_EAP
bugfix: backslashes were removed from pasted text
Migrated to MPS 3.1 EAP 3 (135.584)
Merge branch '31_EAP'

Conflicts:
	build.xml
	solutions/mps-multiline.build/models/mps-multiline/build.mps