Merge pull request #286 from dlobo/CRM-12254
authorcolemanw <coleman@civicrm.org>
Sat, 30 Mar 2013 20:27:52 +0000 (13:27 -0700)
committercolemanw <coleman@civicrm.org>
Sat, 30 Mar 2013 20:27:52 +0000 (13:27 -0700)
CRM-12254


Trivial merge