[jbehave-scm] [scm-web][2/2] Merge branch 'master' of ssh://git.codehaus.org/jbehave-web

[Mauro Talevi]

commit 316325b721b83dd906fe053d9aa13d921836a676
Merge: 4dc6714 b4ddd4e
Author:     Mauro Talevi <mauro.tal...@aquilonia.org>
AuthorDate: Mon, 16 Sep 2013 09:11:55 +0100
Commit:     Mauro Talevi <mauro.tal...@aquilonia.org>
CommitDate: Mon, 16 Sep 2013 09:11:55 +0100

    Merge branch 'master' of ssh://git.codehaus.org/jbehave-web

Changed files:

M       web-selenium/pom.xml
M       
web-selenium/src/main/java/org/jbehave/web/selenium/FluentWebDriverPage.java
M       web-selenium/src/main/java/org/jbehave/web/selenium/WebDriverPage.java
M       
web-selenium/src/test/java/org/jbehave/web/selenium/FluentWebDriverPageTest.java
M       
archetypes/web-selenium-groovy-pico-archetype/src/main/resources/archetype-resources/pom.xml
M       
archetypes/web-selenium-java-spring-archetype/src/main/resources/archetype-resources/pom.xml