alohaeditor/Aloha-Editor — pull request #687 by Jotschi (2012-08-17 08:34:25+00:00)
Title: Dev into Hotfix 0.21.x

Don't merge this pull request. It is just used to track changes within dev.