Merge pull request #1318 from dlobo/CRM-12874
authorTim Otten <to-git@think.hm>
Fri, 2 Aug 2013 19:20:47 +0000 (12:20 -0700)
committerTim Otten <to-git@think.hm>
Fri, 2 Aug 2013 19:20:47 +0000 (12:20 -0700)
CRM-12874


Trivial merge