CiviCRM42/civicrm42-core — pull request #10 by eileenmcnaughton (2013-06-07 01:54:35+00:00)
Title:  CRM-12750: upgrade smarty to 2.6.27 

----------------------------------------
* CRM-12750: upgrade smarty to 2.6.27
http://issues.civicrm.org/jira/browse/CRM-12750

Conflicts:

CRM/Admin/Form/Setting/Component.php