Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2015-01-12-16-09-32
authorkurund <kurund@civicrm.org>
Mon, 12 Jan 2015 10:51:26 +0000 (16:21 +0530)
committerkurund <kurund@civicrm.org>
Mon, 12 Jan 2015 10:51:26 +0000 (16:21 +0530)
commit7d86179d7d8e91160bbb5e6643fa265198a99a2d
tree5091a5b2f8f2e4f7e00b07d82a8d0f007a7d6932
parenta35832db94042b472bba3dc7d37593768483fd6b
parent3ca2a40961ecdf72c6d1766c886c3aeca5e4c442
Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2015-01-12-16-09-32

Conflicts:
CRM/Contact/Page/AJAX.php
CRM/Contribute/Form/ContributionPage/Settings.php
CRM/Contact/Page/AJAX.php
CRM/Contribute/Form/Contribution/Main.php
CRM/Contribute/Form/ContributionPage/Settings.php