Merge branch '4.5' of https://github.com/civicrm/civicrm-core
authorColeman Watts <coleman@civicrm.org>
Thu, 18 Dec 2014 03:09:15 +0000 (22:09 -0500)
committerColeman Watts <coleman@civicrm.org>
Thu, 18 Dec 2014 03:09:15 +0000 (22:09 -0500)
commit3b16a28270778af5122d850f6a4ee7400b8f9920
treefae0628fc925b2ebee3488f1453c42671009251f
parent4ba433ab5f0b6ba9f8eaeecbc5d3e8af724963a2
parent41aefb0966d4b2b042c0d00edbda84d8a472cb29
Merge branch '4.5' of https://github.com/civicrm/civicrm-core

Conflicts:
CRM/Case/BAO/Case.php
sql/civicrm_generated.mysql
xml/version.xml
CRM/Case/BAO/Case.php
CRM/Case/Page/AJAX.php