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

public/javascripts/tiny_mce/plugins/advhr/rule.htm

...ic/javascripts/tiny_mce/plugins/advimage/css/advimage.css

...ic/javascripts/tiny_mce/plugins/advimage/editor_plugin.js

...avascripts/tiny_mce/plugins/advimage/editor_plugin_src.js

public/javascripts/tiny_mce/plugins/advimage/image.htm

public/javascripts/tiny_mce/plugins/advimage/img/sample.gif

public/javascripts/tiny_mce/plugins/advimage/js/image.js

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

public/javascripts/tiny_mce/plugins/advlink/css/advlink.css

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

...javascripts/tiny_mce/plugins/advlink/editor_plugin_src.js

public/javascripts/tiny_mce/plugins/advlink/js/advlink.js

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

public/javascripts/tiny_mce/plugins/advlink/link.htm

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

...javascripts/tiny_mce/plugins/advlist/editor_plugin_src.js

.../javascripts/tiny_mce/plugins/autoresize/editor_plugin.js

...ascripts/tiny_mce/plugins/autoresize/editor_plugin_src.js

...ic/javascripts/tiny_mce/plugins/autosave/editor_plugin.js

...avascripts/tiny_mce/plugins/autosave/editor_plugin_src.js