Merge remote branch 'upstream/master'

Conflicts:
	etherpad/src/etherpad/control/pro/admin/pro_admin_control.js
	etherpad/src/etherpad/control/pro/pro_main_control.js
	etherpad/src/etherpad/control/pro_help_control.js
	etherpad/src/etherpad/globals.js
	etherpad/src/etherpad/legacy_urls.js
	etherpad/src/etherpad/pne/pne_utils.js
	etherpad/src/etherpad/pro/pro_utils.js
	etherpad/src/main.js
	etherpad/src/plugins/fileUpload/templates/fileUpload.ejs
	etherpad/src/plugins/testplugin/templates/page.ejs
	etherpad/src/static/css/pad2_ejs.css
	etherpad/src/static/css/pro-help.css
	etherpad/src/static/img/jun09/pad/protop.gif
	etherpad/src/static/js/store.js
	etherpad/src/themes/default/templates/framed/framedheader-pro.ejs
	etherpad/src/themes/default/templates/main/home.ejs
	etherpad/src/themes/default/templates/pro-help/main.ejs
	etherpad/src/themes/default/templates/pro-help/pro-help-template.ejs
	infrastructure/com.etherpad/licensing.scala
	trunk/etherpad/src/etherpad/collab/ace/contentcollector.js
	trunk/etherpad/src/etherpad/collab/ace/linestylefilter.js
	trunk/etherpad/src/static/css/home-opensource.css
	trunk/etherpad/src/static/js/ace.js
	trunk/etherpad/src/static/js/linestylefilter_client.js
	trunk/etherpad/src/templates/email/eepnet_license_info.ejs
	trunk/etherpad/src/templates/pad/pad_body2.ejs
	trunk/etherpad/src/templates/pad/pad_content.ejs
	trunk/etherpad/src/templates/pad/padfull_body.ejs
	trunk/etherpad/src/templates/pro/admin/pne-license-manager.ejs

1 files changed, 0 insertions, 53 deletions

diff --git a/trunk/infrastructure/framework-src/modules/email.js b/trunk/infrastructure/framework-src/modules/email.js
deleted file mode 100644
index 2d81dc3..0000000
--- a/trunk/infrastructure/framework-src/modules/email.js
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * Copyright 2009 Google Inc.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS-IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// import("jsutils.eachProperty");
-//
-// function _paramObjectToParamArray(params, enc) {
-//   var pa = [];
-//   eachProperty(params, function(k, v) {
-//     pa.push(enc ? encodeURIComponent(k.toString()) : k.toString());
-//     pa.push(enc ? encodeURIComponent(v.toString()) : v.toString());
-//   });
-//   return pa;
-// }
-
-/**
- * Simple way to send an email to a single recipient. Emails will have a
- * "from" address of <code>noreply@{appjet.appName}.{appjet.mainDomain}</code>.
- *
- * Sending is limited to 100 emails per developer account per day.  However,
- * emails sent to the address on file for the app's owner are not counted
- * toward this limit.
- *
- * @example
-result = sendEmail("noone@example.com", "Test Subject",
-                   "Greetings!", {"Reply-To": "sender@example.com"});
- *
- * @param {strings} toAddress An array of email address strings, or a single string.
- * @param {string} subject The message subject.
- * @param {string} body The message body.
- * @param {object} [headers] Optional headers to include in the
- * message, as a dictionary of {name: value} entries.
- */
-function sendEmail(toAddress, fromAddress, subject, headers, body) {
-  if (typeof(toAddress) == 'string')
-    toAddress = [toAddress];
-  var ret = Packages.net.appjet.ajstdlib.email.sendEmail(toAddress, fromAddress, subject, headers, body);
-  if (ret != "")
-    throw new Error(ret);
-}
-