Merge branch 'next' of ssh://lsleditor.git.sourceforge.net/gitroot/lsleditor/lsleditor into next

Conflicts:
	trunk/Resource/ReleaseNotes.htm
This commit is contained in:
niel-archer 2011-12-17 23:05:32 +00:00
commit f946959943

Diff content is not available