Merge remote-tracking branch 'origin/4.6' into 4.6-master-2015-08-03-16-00-35
authorTim Otten <totten@civicrm.org>
Mon, 3 Aug 2015 23:00:44 +0000 (16:00 -0700)
committerTim Otten <totten@civicrm.org>
Mon, 3 Aug 2015 23:00:44 +0000 (16:00 -0700)
1  2 
tests/phpunit/api/v3/ContactTest.php

Simple merge