Merge branch 'master' of https://code.google.com/p/selenium

Author: jimevans

.mailmap

@@ -35,3 +35,4 @@ Seva Lotoshnikov <sevalo@google.com> <vlotoshnikov@gmail.com>
 Simon Stewart <simon.m.stewart@gmail.com> <simons@fb.com>
 Simon Stewart <simon.m.stewart@gmail.com> Simon M Stewart
 Stuart Knightly <stuidge@gmail.com>
+Yi Zeng <yi.zeng.dev@gmail.com> Yi Zeng <yi.zeng.nz@gmail.com>

AUTHORS

@@ -143,6 +143,6 @@ Vincent Ladeuil <vila+github@canonical.com>
 Vyvyan Codd
 WORKSTATION02 <clz.livio@gmail.com>
 wpc <wpc@example.com>
-Yi Zeng <yi.zeng.nz@gmail.com>
+Yi Zeng <yi.zeng.dev@gmail.com>
 Zoltar - Knower of All
 zsong <zsong@example.com>

maven/java/pom.xml

@@ -103,10 +103,9 @@
  <configuration>
  <tasks>
  <!-- Extract *.js files from client-combined-nodeps.jar to target/classes ... -->
- <unjar src="../../build/java/client/src/org/openqa/selenium/client-combined-nodeps.jar" dest="target/classes">
+ <unjar src="../../build/java/client/src/com/thoughtworks/selenium/webdriven/webdriven.jar" dest="target/classes">
  <patternset>
- <include name="**/seleniumemulation/selenium_atoms/*.js" />
- <include name="**/seleniumemulation/scripts/*.js" />
+ <include name="**/webdriven/*.js" />
  </patternset>
  </unjar>
  </tasks>