Merge pull request #1307 from eileenmcnaughton/CRM-12108
authorTim Otten <to-git@think.hm>
Thu, 1 Aug 2013 23:49:05 +0000 (16:49 -0700)
committerTim Otten <to-git@think.hm>
Thu, 1 Aug 2013 23:49:05 +0000 (16:49 -0700)
 CRM-12108 fix bug introduced when rebasing PR


Trivial merge