Merge pull request #1526 from eileenmcnaughton/master
authorTim Otten <to-git@think.hm>
Wed, 28 Aug 2013 04:58:50 +0000 (21:58 -0700)
committerTim Otten <to-git@think.hm>
Wed, 28 Aug 2013 04:58:50 +0000 (21:58 -0700)
commitb93fbffeb04dd04624fc59795be731db5b23c8f9
treeb616ed0118ab2ec20f279d32ee18823ae0b97b81
parentb3246dd3a9bee80d2b6aa9a5b394624a6fd71902
parentef3a8cf010370949e60788589b8909daed95dd13
Merge pull request #1526 from eileenmcnaughton/master

CRM-13294 - extra fix + test fix