From: Tim Otten Date: Mon, 1 Apr 2013 19:26:24 +0000 (-0400) Subject: Merge branch 'MiscFixes' of github.com:dlobo/civicrm-core into dlobo-MiscFixes X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=b8f92c56d29dcedc35bcd543620114c59f06ed12;p=civicrm-core.git Merge branch 'MiscFixes' of github.com:dlobo/civicrm-core into dlobo-MiscFixes Conflicts: CRM/Core/BAO/File.php --- b8f92c56d29dcedc35bcd543620114c59f06ed12