Merge branch 'ARQ-222' of git://github.com/aslakknutsen/arquillian in… · arquillian/arquillian-container-jetty@e0d99c6 · GitHub

Commit

Merge branch 'ARQ-222' of git://github.com/aslakknutsen/arquillian in…

Browse files

…to next

Conflicts:
	frameworks/jsfunit/src/main/java/org/jboss/arquillian/framework/jsfunit/JSFUnitArchiveAppender.java

Loading branch information

aslakknutsen committed Sep 5, 2010

2 parents e77c389 + afc4c79 commit e0d99c6