projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cf46b95 b155a03)
Merge pull request #4622 from civicrm/4.5
authorcolemanw <coleman@civicrm.org>
Thu, 27 Nov 2014 15:08:07 +0000 (10:08 -0500)
committercolemanw <coleman@civicrm.org>
Thu, 27 Nov 2014 15:08:07 +0000 (10:08 -0500)
Merge branch 4.5 into master

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

diff --cc CRM/Contact/BAO/Contact.php
Simple merge
diff --cc CRM/Core/DAO.php
Simple merge