Merge pull request #4806 from civicrm/4.5
authorcolemanw <coleman@civicrm.org>
Tue, 30 Dec 2014 15:52:03 +0000 (10:52 -0500)
committercolemanw <coleman@civicrm.org>
Tue, 30 Dec 2014 15:52:03 +0000 (10:52 -0500)
commit347185d7709adf00659d042b2fa98b93f03f2672
treec27d47f6eac5f6979b0676828f7f5fe187bf370f
parenta1c7395c3829f6dbbdbf27ac0f5806158de66346
parenta64e8e6057e6e556239fbd112af7bce65447e7b1
Merge pull request #4806 from civicrm/4.5

Merge branch 4.5 into master
CRM/Admin/Form/Setting/Miscellaneous.php
CRM/Core/Payment/PaymentExpressUtils.php