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)
CRM-13294 - extra fix + test fix


Trivial merge