Merge branch 'master' of github.com:diaspora/diaspora

public/javascripts/tiny_mce/plugins/fullpage/langs/en_dlg.js

.../javascripts/tiny_mce/plugins/fullscreen/editor_plugin.js

...ascripts/tiny_mce/plugins/fullscreen/editor_plugin_src.js

...ic/javascripts/tiny_mce/plugins/fullscreen/fullscreen.htm

public/javascripts/tiny_mce/plugins/iespell/editor_plugin.js

...javascripts/tiny_mce/plugins/iespell/editor_plugin_src.js

...avascripts/tiny_mce/plugins/inlinepopups/editor_plugin.js

...cripts/tiny_mce/plugins/inlinepopups/editor_plugin_src.js

..._mce/plugins/inlinepopups/skins/clearlooks2/img/alert.gif

...mce/plugins/inlinepopups/skins/clearlooks2/img/button.gif

...ce/plugins/inlinepopups/skins/clearlooks2/img/buttons.gif

...ce/plugins/inlinepopups/skins/clearlooks2/img/confirm.gif

...ce/plugins/inlinepopups/skins/clearlooks2/img/corners.gif

...plugins/inlinepopups/skins/clearlooks2/img/horizontal.gif

...e/plugins/inlinepopups/skins/clearlooks2/img/vertical.gif

...iny_mce/plugins/inlinepopups/skins/clearlooks2/window.css

...ic/javascripts/tiny_mce/plugins/inlinepopups/template.htm

...ascripts/tiny_mce/plugins/insertdatetime/editor_plugin.js

...ipts/tiny_mce/plugins/insertdatetime/editor_plugin_src.js

public/javascripts/tiny_mce/plugins/layer/editor_plugin.js