Merge pull request #46 from dlobo/CRM-11994
authorTim Otten <to-git@think.hm>
Tue, 5 Mar 2013 22:59:53 +0000 (14:59 -0800)
committerTim Otten <to-git@think.hm>
Tue, 5 Mar 2013 22:59:53 +0000 (14:59 -0800)
fix CRM-11994 and also a bunch of php 5.4 notices


Trivial merge