alohaeditor/Aloha-Editor — pull request #507 by Jotschi (2012-04-16 08:14:48+00:00)
Title: Dev

After releasing 0.20.8 we need to merge back to the dev. There was only one big conflict which i could not resolve. @petro065 @evo42 Your changes conflict in markup.js