Merge pull request #2224 from colemanw/4.4
authorcolemanw <coleman@civicrm.org>
Tue, 17 Dec 2013 03:54:27 +0000 (19:54 -0800)
committercolemanw <coleman@civicrm.org>
Tue, 17 Dec 2013 03:54:27 +0000 (19:54 -0800)
CRM-13929 - fix drupal jQuery vs cj collision


Trivial merge