Merge branch 'CRM-13067-bao-prep' of https://github.com/eileenmcnaughton/civicrm...
authorColeman Watts <coleman@civicrm.org>
Sun, 4 Aug 2013 23:42:23 +0000 (16:42 -0700)
committerColeman Watts <coleman@civicrm.org>
Sun, 4 Aug 2013 23:42:23 +0000 (16:42 -0700)
commit73b3104729feb981b3741b7ab5b1f9ed675f8fcf
treec172e358ed45e89979923cce715adf63ac5aaa43
parentc1b38a0d832e48a48da6963c77930600f4e0062c
parent8c33a68ca6818cdf9ac95d84d0ebc1ee24f95af7
Merge branch 'CRM-13067-bao-prep' of https://github.com/eileenmcnaughton/civicrm-core into CRM-13067-bao-prep

Conflicts:
api/v3/Membership.php
tests/phpunit/api/v3/MembershipTest.php

----------------------------------------
* CRM-13067-bao-prep:
  http://issues.civicrm.org/jira/browse/CRM-13067-bao-prep
CRM/Member/BAO/Membership.php
CRM/Member/Form/MembershipRenewal.php
api/v3/examples/Membership/filterIsCurrent.php
api/v3/examples/MembershipCreate.php
api/v3/examples/MembershipGet.php
api/v3/examples/MembershipUpdate.php
tests/phpunit/CiviTest/CiviUnitTestCase.php
tests/phpunit/api/v3/MembershipTest.php