Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-07-31-15-53-16

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

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