[seam-commits] [seam/wicket] e273dc: Merge branch 'migration-to-drone' of git://github....

[noreply at github.com]

  Branch: refs/heads/develop
  Home:   https://github.com/seam/wicket

  Commit: e273dcab9a1c440c0547c61f9690c52539770801
      https://github.com/seam/wicket/commit/e273dcab9a1c440c0547c61f9690c52539770801
  Author: Jozef Hartinger <jharting at redhat.com>
  Date:   2011-10-04 (Tue, 04 Oct 2011)

  Changed paths:
    M examples/numberguess/pom.xml
  M examples/numberguess/readme.txt
  M examples/numberguess/src/test/java/org/jboss/seam/wicket/examples/numberguess/ftest/HomePage.java
  M examples/numberguess/src/test/java/org/jboss/seam/wicket/examples/numberguess/ftest/NumberGuessTest.java
  M examples/numberguess/src/test/java/org/jboss/seam/wicket/examples/numberguess/test/HomePageTest.java
  R examples/numberguess/src/test/java/org/jboss/seam/wicket/examples/numberguess/test/util/MavenArtifactResolver.java
  M examples/numberguess/src/test/resources/arquillian.xml
  R examples/numberguess/src/test/resources/ftests.xml
  M settings.xml

  Log Message:
  -----------
  Merge branch 'migration-to-drone' of git://github.com/tremes/wicket into migration-to-drone

Conflicts:
	examples/numberguess/pom.xml
	pom.xml