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)
commit6b0ed53f06b2a702da97edc5f68e3f94b2d9c450
tree035d60e04c4de25791acabcb63423152ede5227d
parentcd6b459b81f8aebf0eda95e209d1538effd264ee
parent4feb1cad3dd21f0a64ca1c757b0d2611abd078e1
Merge pull request #6351 from colemanw/CRM-16645

CRM-16645 - Fix param name collision with wp