Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2015-01-26-14-28-00
authorkurund <kurund@civicrm.org>
Mon, 26 Jan 2015 09:07:58 +0000 (14:37 +0530)
committerkurund <kurund@civicrm.org>
Mon, 26 Jan 2015 09:07:58 +0000 (14:37 +0530)
commit709e574bfc8b047d9e9f9a6ad84595bc3f560b54
treedf8ad4c35b7b927c0ddea154cb65ad994338ec64
parentf76eb8ae46b3691478093256152c99043edca271
parent3a76a063cd7f3338edbe4fca643124ce61fae27f
Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2015-01-26-14-28-00

Conflicts:
CRM/Contact/Page/ImageFile.php
CRM/Contribute/Form/SoftCredit.php
CRM/Event/Form/ManageEvent/Registration.php
CRM/Contact/Page/ImageFile.php
CRM/Event/Form/ManageEvent/Registration.php