projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2378619 35598dc)
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-10-22-00-05-43
authorkurund <kurund@civicrm.org>
Mon, 21 Oct 2013 18:36:28 +0000 (00:06 +0530)
committerkurund <kurund@civicrm.org>
Mon, 21 Oct 2013 18:36:28 +0000 (00:06 +0530)
Conflicts:
sql/civicrm_generated.mysql

1  2 
CRM/Contact/BAO/Query.php patch | diff1 | diff2 | blob | history

diff --cc CRM/Contact/BAO/Query.php
Simple merge