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

Aleksander Machniak

2014-03-14 c29ca0e11d1f1b3e8695935615bf11e447c6ebf6

 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');