alohaeditor/Aloha-Editor — pull request #334 by nka11 (2011-10-21 21:13:28+00:00)
Title: Merging latest devs to most active branch

to avoid big delta and hard merge