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

This repository has been archived by the owner on Nov 19, 2018. It is now read-only.

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 28a248b + c9cfd95 commit ad65fb2