tree fb1ea67530c6197924c41155f4e38e3dbd2a0ba2
parent d645240e6244d712c5bd497757df2971f2da6550
parent 33166cb0199664afb5f284655520195313ff1197
author Kevin KIN-FOO <kkinfoo@sierrawireless.com> 1421864633 +0100
committer Kevin KIN-FOO <kkinfoo@sierrawireless.com> 1421864633 +0100

Merge branch 'lua52'

Conflicts:
	plugins/org.eclipse.ldt.ui/OSGI-INF/l10n/bundle.properties
	plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/wizards/LuaProjectCreator.java
	plugins/org.eclipse.ldt/META-INF/MANIFEST.MF