Merge pull request #186 from dlobo/CRM-12147
authorTim Otten <to-git@think.hm>
Tue, 19 Mar 2013 00:52:40 +0000 (17:52 -0700)
committerTim Otten <to-git@think.hm>
Tue, 19 Mar 2013 00:52:40 +0000 (17:52 -0700)
CRM-12147


Trivial merge