Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2015-03-03-23-44-14
authorkurund <kurund@civicrm.org>
Tue, 3 Mar 2015 18:16:07 +0000 (23:46 +0530)
committerkurund <kurund@civicrm.org>
Tue, 3 Mar 2015 18:16:07 +0000 (23:46 +0530)
commit5d867d83ac582e4c45417c82610d569100d6da43
tree593a7fa500e3698159399c486e4747a20e97ab0b
parenta3b6f1a208a9935def77842b5683c55dab624346
parentf95ae033b9067cddaf3231243300d65bf34425a9
Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2015-03-03-23-44-14

Conflicts:
CRM/Profile/Page/Dynamic.php
CRM/Core/Error.php
CRM/Mailing/Form/Test.php
CRM/PCP/BAO/PCP.php
CRM/Profile/Page/Dynamic.php
CRM/Utils/System/DrupalBase.php