Merge pull request #416 from dlobo/CRM-8963
authorTim Otten <to-git@think.hm>
Sat, 13 Apr 2013 18:44:50 +0000 (11:44 -0700)
committerTim Otten <to-git@think.hm>
Sat, 13 Apr 2013 18:44:50 +0000 (11:44 -0700)
CRM-8963


Trivial merge