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)
commit291e6eee065e4226daf2ee824bb7ebdb6e0434da
tree7018585373f284b3b2a3ae2abe8c3572a4d8f254
parent667aa80154b996a1439a040dcb708d4841d01fbc
parente352b9cd5f3ab05ff85b0db807cd06a100f5ae07
Merge pull request #2224 from colemanw/4.4

CRM-13929 - fix drupal jQuery vs cj collision