Merge pull request #434 from dlobo/CRM-12355
authorTim Otten <to-git@think.hm>
Tue, 16 Apr 2013 17:54:12 +0000 (10:54 -0700)
committerTim Otten <to-git@think.hm>
Tue, 16 Apr 2013 17:54:12 +0000 (10:54 -0700)
CRM-12355


Trivial merge