Merge pull request #5286 from eileenmcnaughton/master
authorcolemanw <coleman@civicrm.org>
Tue, 3 Mar 2015 14:18:43 +0000 (09:18 -0500)
committercolemanw <coleman@civicrm.org>
Tue, 3 Mar 2015 14:18:43 +0000 (09:18 -0500)
commitab9accea8086c8f026f34a7dec6f5612f5b77c09
tree71e0581dcdb6bf22a0de8504e2d98750d7b02648
parentfffee4c312898f06abed0a4a572181277bbee589
parent07f441658f275f6b0540b5cc8edef69393d1c763
Merge pull request #5286 from eileenmcnaughton/master

CRM-15941 separate parts of criteria tpl