Merge pull request #5550 from civicrm/4.5
authorcolemanw <coleman@civicrm.org>
Thu, 2 Apr 2015 23:22:59 +0000 (19:22 -0400)
committercolemanw <coleman@civicrm.org>
Thu, 2 Apr 2015 23:22:59 +0000 (19:22 -0400)
commit674cb8b854f6008090d4dcce9372ee76346a198f
treee248ee626a2c9db38629d20e11031c7b65c05314
parente810b3ba75719b963d9121075b82a1087adc92e3
parentae5a48c52488abcb24a893a2b168decf9405bf01
Merge pull request #5550 from civicrm/4.5

Merge branch 4.5 into 4.6
CRM/Core/DAO/permissions.php
tests/phpunit/CRM/Utils/HttpClientTest.php