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

17 files changed, 0 insertions, 2 deletions

diff --git a/trunk/infrastructure/lib/activation.jar b/trunk/infrastructure/lib/activation.jar
deleted file mode 100644
index 29a59a9..0000000
--- a/trunk/infrastructure/lib/activation.jar
+++ /dev/null
diff --git a/trunk/infrastructure/lib/c3p0-0.9.1.2.jar b/trunk/infrastructure/lib/c3p0-0.9.1.2.jar
deleted file mode 100644
index 0f42d60..0000000
--- a/trunk/infrastructure/lib/c3p0-0.9.1.2.jar
+++ /dev/null
diff --git a/trunk/infrastructure/lib/commons-lang-2.4.jar b/trunk/infrastructure/lib/commons-lang-2.4.jar
deleted file mode 100644
index 532939e..0000000
--- a/trunk/infrastructure/lib/commons-lang-2.4.jar
+++ /dev/null
diff --git a/trunk/infrastructure/lib/derby-10.5.1.1.jar b/trunk/infrastructure/lib/derby-10.5.1.1.jar
deleted file mode 100644
index 2820dbd..0000000
--- a/trunk/infrastructure/lib/derby-10.5.1.1.jar
+++ /dev/null
diff --git a/trunk/infrastructure/lib/derbytools.jar b/trunk/infrastructure/lib/derbytools.jar
deleted file mode 100644
index 4aa76e1..0000000
--- a/trunk/infrastructure/lib/derbytools.jar
+++ /dev/null
diff --git a/trunk/infrastructure/lib/dnsjava-2.0.6.jar b/trunk/infrastructure/lib/dnsjava-2.0.6.jar
deleted file mode 100644
index e41f9b0..0000000
--- a/trunk/infrastructure/lib/dnsjava-2.0.6.jar
+++ /dev/null
diff --git a/trunk/infrastructure/lib/jetty-6.1.20.jar b/trunk/infrastructure/lib/jetty-6.1.20.jar
deleted file mode 100644
index 8f45db9..0000000
--- a/trunk/infrastructure/lib/jetty-6.1.20.jar
+++ /dev/null
diff --git a/trunk/infrastructure/lib/jetty-sslengine-6.1.20.jar b/trunk/infrastructure/lib/jetty-sslengine-6.1.20.jar
deleted file mode 100644
index 6f7d232..0000000
--- a/trunk/infrastructure/lib/jetty-sslengine-6.1.20.jar
+++ /dev/null
diff --git a/trunk/infrastructure/lib/jetty-util-6.1.20.jar b/trunk/infrastructure/lib/jetty-util-6.1.20.jar
deleted file mode 100644
index 96c0979..0000000
--- a/trunk/infrastructure/lib/jetty-util-6.1.20.jar
+++ /dev/null
diff --git a/trunk/infrastructure/lib/json.jar b/trunk/infrastructure/lib/json.jar
deleted file mode 100644
index 5ab955c..0000000
--- a/trunk/infrastructure/lib/json.jar
+++ /dev/null
diff --git a/trunk/infrastructure/lib/mail.jar b/trunk/infrastructure/lib/mail.jar
deleted file mode 100644
index e6f7083..0000000
--- a/trunk/infrastructure/lib/mail.jar
+++ /dev/null
diff --git a/trunk/infrastructure/lib/manifest b/trunk/infrastructure/lib/manifest
deleted file mode 100644
index b91a5a7..0000000
--- a/trunk/infrastructure/lib/manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-Manifest-Version: 0.1
-Main-Class: com.etherpad.main
diff --git a/trunk/infrastructure/lib/rhino-js-1.7r1.jar b/trunk/infrastructure/lib/rhino-js-1.7r1.jar
deleted file mode 100644
index 79f8529..0000000
--- a/trunk/infrastructure/lib/rhino-js-1.7r1.jar
+++ /dev/null
diff --git a/trunk/infrastructure/lib/sanselan-0.94aj.jar b/trunk/infrastructure/lib/sanselan-0.94aj.jar
deleted file mode 100644
index 0fd8c96..0000000
--- a/trunk/infrastructure/lib/sanselan-0.94aj.jar
+++ /dev/null
diff --git a/trunk/infrastructure/lib/servlet-api-2.5-20081211.jar b/trunk/infrastructure/lib/servlet-api-2.5-20081211.jar
deleted file mode 100644
index f1bfa12..0000000
--- a/trunk/infrastructure/lib/servlet-api-2.5-20081211.jar
+++ /dev/null
diff --git a/trunk/infrastructure/lib/tagsoup-1.2.jar b/trunk/infrastructure/lib/tagsoup-1.2.jar
deleted file mode 100644
index af27803..0000000
--- a/trunk/infrastructure/lib/tagsoup-1.2.jar
+++ /dev/null
diff --git a/trunk/infrastructure/lib/yuicompressor-2.4-appjet.jar b/trunk/infrastructure/lib/yuicompressor-2.4-appjet.jar
deleted file mode 100644
index b5bdfc1..0000000
--- a/trunk/infrastructure/lib/yuicompressor-2.4-appjet.jar
+++ /dev/null