Merge pull request #1212 from yashodha/trunk

[civicrm-core.git] / js / jquery.conflict.js

var cj = jQuery.noConflict(); $ = cj;