Merge pull request #6351 from colemanw/CRM-16645
authorcolemanw <coleman@civicrm.org>
Wed, 29 Jul 2015 21:20:04 +0000 (17:20 -0400)
committercolemanw <coleman@civicrm.org>
Wed, 29 Jul 2015 21:20:04 +0000 (17:20 -0400)
CRM-16645 - Fix param name collision with wp


Trivial merge