Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2015-02-02-18-36-16
authorkurund <kurund@civicrm.org>
Mon, 2 Feb 2015 13:10:24 +0000 (18:40 +0530)
committerkurund <kurund@civicrm.org>
Mon, 2 Feb 2015 13:10:24 +0000 (18:40 +0530)
commit82e7a8b8a4054c4814900ddf5e8fc56d6819c134
tree53d9738ad646698437a0a1c9debbc42df0f33861
parent3b14bfec8a2c2f2a5b293be6b981bf58da73b832
parentbb69be5d7613e6dc8d83b47388e90c0a6f622f8d
Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2015-02-02-18-36-16

Conflicts:
CRM/Dedupe/Merger.php
CRM/Dedupe/Merger.php