Merge branch 'MiscFixes' of github.com:dlobo/civicrm-core into dlobo-MiscFixes
authorTim Otten <totten@civicrm.org>
Mon, 1 Apr 2013 19:26:24 +0000 (15:26 -0400)
committerTim Otten <totten@civicrm.org>
Mon, 1 Apr 2013 19:26:24 +0000 (15:26 -0400)
commitb8f92c56d29dcedc35bcd543620114c59f06ed12
treef6dc95353b15667f1da714f72a6f3efa44146f8b
parentf85fef43faf581b54d4c2260aeba298ed6983985
parentafef19e462262ce02282f9ad37f378c100f7e2d9
Merge branch 'MiscFixes' of github.com:dlobo/civicrm-core into dlobo-MiscFixes

Conflicts:
CRM/Core/BAO/File.php