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