alohaeditor/Aloha-Editor — pull request #541 by evo42 (2012-05-10 10:31:52+00:00)
Title: fixed unresolved merge

fixes #540 // https://github.com/alohaeditor/Aloha-Editor/commit/81b82517963f51cd69e3490cdac35cd43b8a76a4#commitcomment-1314057