Merge branch '4.4' into master
authorColeman Watts <coleman@civicrm.org>
Sun, 27 Apr 2014 20:19:30 +0000 (13:19 -0700)
committerColeman Watts <coleman@civicrm.org>
Sun, 27 Apr 2014 20:19:30 +0000 (13:19 -0700)
commit5563fe43b44b754e6441841a5d92664470b20366
tree4ae63de651f5ca78969d714b66ecbf2faa6b0ad0
parentc547136be02f47f17e8b9c26bb23dfffcdc90a5b
parent718584d78a3d9a5f77d30247a74de2311ed9bdc1
Merge branch '4.4' into master

Conflicts:
CRM/Core/BAO/CustomQuery.php
CRM/Contact/BAO/Contact.php
CRM/Core/BAO/CustomQuery.php
CRM/Core/Session.php
api/v3/utils.php