svn merge -r 1457328:1457329 https://svn.apache.org/repos/asf/tomee/tomee/branches/tomee-1.5.x

http://svn.apache.org/viewvc?view=revision&revision=1457329
------------------------------------------------------------------------
r1457329 | dblevins | 2013-03-16 15:49:19 -0700 (Sat, 16 Mar 2013) | 2 lines

TOMEE-835 - Allow Arquillian config properties to be set via properties files

------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/tomee/tomee/trunk@1457331 13f79535-47bb-0310-9956-ffa450edef68