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)
commitec712c0779e1ef9883665ec22d14be0aabb0f470
treea2ee4f72540a364a784be9519c9b09b24e189848
parentcf46b95ff258a803daafef9d885398156d8ca1f4
parentb155a039d084459d77dc4c7a191ffd0e516b0b62
Merge pull request #4622 from civicrm/4.5

Merge branch 4.5 into master
CRM/Contact/BAO/Contact.php
CRM/Core/DAO.php