Permalink
Browse files

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

…to next

Conflicts:
	frameworks/jsfunit/src/main/java/org/jboss/arquillian/framework/jsfunit/JSFUnitArchiveAppender.java
  • Loading branch information...
2 parents 28a248b + c9cfd95 commit ad65fb2ec1aa20f556381b2cd89f7ccd1b787604 @aslakknutsen aslakknutsen committed Sep 5, 2010
Showing with 0 additions and 0 deletions.

0 comments on commit ad65fb2

Please sign in to comment.