Merge pull request #1377 from kurund/CRM-12930
authorTim Otten <to-git@think.hm>
Thu, 8 Aug 2013 21:33:31 +0000 (14:33 -0700)
committerTim Otten <to-git@think.hm>
Thu, 8 Aug 2013 21:33:31 +0000 (14:33 -0700)
CRM-12930, reverting commits associated with this issue


Trivial merge