Merge branch 'master' into grid

Conflicts:
	WebContent/release-notes.html

Change-Id: Icccb2e30199f99a7b0b00f05b1a12d5f7297402f

1 files changed, 5 insertions, 2 deletions

diff --git a/uitest/src/com/vaadin/tests/VerifyBrowserVersionTest.java b/uitest/src/com/vaadin/tests/VerifyBrowserVersionTest.java
index c2dc400d8b..53317bd581 100644
--- a/uitest/src/com/vaadin/tests/VerifyBrowserVersionTest.java
+++ b/uitest/src/com/vaadin/tests/VerifyBrowserVersionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 Vaadin Ltd.
+ * Copyright 2000-2014 Vaadin Ltd.
  * 
  * 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
@@ -47,6 +47,9 @@ public class VerifyBrowserVersionTest extends MultiBrowserTest {
         expectedUserAgent
                 .put(Browser.CHROME.getDesiredCapabilities(),
                         "Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/33.0.1750.117 Safari/537.36");
+        expectedUserAgent
+                .put(Browser.PHANTOMJS.getDesiredCapabilities(),
+                        "Mozilla/5.0 (Windows NT 6.1) AppleWebKit/534.34 (KHTML, like Gecko) PhantomJS/1.9.7 Safari/534.34");
 
     }
 
@@ -58,4 +61,4 @@ public class VerifyBrowserVersionTest extends MultiBrowserTest {
         Assert.assertEquals("Touch device? No",
                 vaadinElementById("touchDevice").getText());
     }
-}
\ No newline at end of file
+}