Merge pull request #2475 from totten/4.4-CRM-14092
authorTim Otten <to-git@think.hm>
Wed, 5 Feb 2014 20:39:23 +0000 (12:39 -0800)
committerTim Otten <to-git@think.hm>
Wed, 5 Feb 2014 20:39:23 +0000 (12:39 -0800)
CRM-14091, CRM-14092


Trivial merge