Vlasta Ramik 6dd7634a77 Merge remote-tracking branch 'upstream/master' into prod ... Conflicts: testsuite/integration-arquillian/tests/adapters/eap6/pom.xml testsuite/integration-arquillian/tests/adapters/eap6/src/main/xslt/standalone.xsl		2016-01-13 12:09:34 +01:00
..
eap6	Merge pull request #2011 from mhajas/eap64	2016-01-13 11:09:49 +01:00
eap7
migration	Version bump	2016-01-13 09:20:38 +01:00
wildfly	Merge remote-tracking branch 'upstream/master' into prod	2016-01-13 12:09:34 +01:00
pom.xml	Merge remote-tracking branch 'upstream/master' into prod	2016-01-13 12:09:34 +01:00