Merge pull request #1707 from lcdservices/CRM-13455
[civicrm-core.git] / js / jquery.conflict.js
2013-03-01 Tim OttenImport from SVN (r45945, r596)