projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2fd36ab 1031204)
Merge remote-tracking branch 'upstream/4.5' into 4.5-4.6-2015-03-23-18-42-19
authorkurund <kurund@civicrm.org>
Mon, 23 Mar 2015 13:13:19 +0000 (18:43 +0530)
committerkurund <kurund@civicrm.org>
Mon, 23 Mar 2015 13:13:19 +0000 (18:43 +0530)
Conflicts:
CRM/Contact/Form/CustomData.php


Trivial merge