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, 103 deletions

diff --git a/trunk/infrastructure/rhino1_7R1/toolsrc/build.xml b/trunk/infrastructure/rhino1_7R1/toolsrc/build.xml
deleted file mode 100644
index be9a9b7..0000000
--- a/trunk/infrastructure/rhino1_7R1/toolsrc/build.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (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.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Rhino code, released May 6, 1999.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corporation.
-   - Portions created by the Initial Developer are Copyright (C) 1997-1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - the GNU General Public License Version 2 or later (the "GPL"), in which
-   - case the provisions of the GPL are applicable instead of those above. If
-   - you wish to allow use of your version of this file only under the terms of
-   - the GPL and not to allow others to use your version of this file under the
-   - MPL, indicate your decision by deleting the provisions above and replacing
-   - them with the notice and other provisions required by the GPL. If you do
-   - not delete the provisions above, a recipient may use your version of this
-   - file under either the MPL or the GPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-
-<!--
-Build file for Rhino using Ant (see http://jakarta.apache.org/ant/index.html)
-Requires Ant version 1.2
--->
-<project name="toolsrc" default="compile" basedir="..">
-
-  <target name="properties">
-    <property file="build.properties"/>
-    <property name="debugger"
-              value="org/mozilla/javascript/tools/debugger"/>
-  </target>
-
-  <target name="compile" depends="properties">
-    <javac srcdir="toolsrc"
-           destdir="${classes}"
-           includes="org/**/*.java"
-           excludes="org/**/debugger/*.java"
-           deprecation="on"
-           debug="${debug}"
-           target="${target-jvm}"
-           source="${source-level}"
-    >
-    </javac>
-    <copy todir="${classes}">
-      <fileset dir="toolsrc" includes="org/**/*.properties" />
-    </copy>
-  </target>
-
-  <target name="copy-source" depends="properties">
-    <mkdir dir="${dist.dir}/toolsrc"/>
-    <copy todir="${dist.dir}/toolsrc">
-      <fileset dir="toolsrc"
-               includes="**/*.java,**/*.properties,**/*.xml"
-               excludes="${debugger}/downloaded/**" />
-    </copy>
-  </target>
-
-  <target name="download-debugger" depends="properties">
-    <ant dir="toolsrc/${debugger}" target="download"/>
-  </target>
-
-  <target name="compile-debugger" depends="download-debugger">
-    <mkdir dir="classes"/>
-    <javac srcdir="toolsrc"
-           destdir="classes"
-           includes="org/**/debugger/*.java,org/**/debugger/downloaded/*.java"
-           classpath="js.jar"
-           deprecation="on"
-           target="${target-jvm}"
-           source="${source-level}"/>
-    <copy todir="classes">
-      <fileset dir="toolsrc" includes="org/**/*.properties" />
-    </copy>
-    <jar jarfile="js.jar"
-         basedir="classes"
-         update="yes"
-     />
-  </target>
-
-  <target name="clean" depends="properties">
-    <delete includeEmptyDirs="true">
-      <fileset dir="${classes}"
-               includes="org/mozilla/javascript/tools/**"/>
-    </delete>
-  </target>
-
-</project>