Merge branch 'master' of github.com:roundcube/roundcubemail

Aleksander Machniak

2012-08-14 c965c8abe1aa55a70844e2c95de9bb8d8293e9eb

 program/js/tiny_mce/plugins/media/editor_plugin_src.js

@@ -382,7 +382,7 @@
         data = JSON.parse(data);

         typeItem = this.getType(node.attr('class'));



         style = node.attr('data-mce-style')

         style = node.attr('data-mce-style');

         if (!style) {

            style = node.attr('style');