Merge pull request #4283 from davecivicrm/CRM-15380
authorDave Greenberg <dave@civicrm.org>
Tue, 30 Sep 2014 22:36:41 +0000 (15:36 -0700)
committerDave Greenberg <dave@civicrm.org>
Tue, 30 Sep 2014 22:36:41 +0000 (15:36 -0700)
commitc96109a508b7b2c1d12f641fa2bf87e7274651cf
tree742fd423fd4693f6edea0fbd26bcfad585c1ff5f
parentdd9a3f7f37c7d5c3a76306a9e026694daa5aa341
parente59da3a9818ba9b69ab37f8403c4256338c61985
Merge pull request #4283 from davecivicrm/CRM-15380

CRM-15380 - Replaces PR 4273.