alohaeditor/Aloha-Editor — pull request #506 by Jotschi (2012-04-16 08:12:03+00:00)
Title: Dev

Before we delete the release branch we should merge the changes back to dev