Merge pull request #3890 from colemanw/CRM-14052
authorDave Greenberg <dave@civicrm.org>
Thu, 21 Aug 2014 23:23:48 +0000 (16:23 -0700)
committerDave Greenberg <dave@civicrm.org>
Thu, 21 Aug 2014 23:23:48 +0000 (16:23 -0700)
CRM-14052 - Revert workarounds for tokenInput.js and cleanup tagset code


Trivial merge