Merge branch 4.5 into master
authorColeman Watts <coleman@civicrm.org>
Sat, 10 Jan 2015 02:47:51 +0000 (21:47 -0500)
committerColeman Watts <coleman@civicrm.org>
Sat, 10 Jan 2015 02:47:51 +0000 (21:47 -0500)
commit49414d6faa37375cef1ea0a156054ddd9cc6ae8d
tree2f5c873430d25fd2e3cc019fb1883b2b1ee5b8a0
parentbfc6355af6949ca1e4a7c39d0f54f0ec70b641bf
parent098a61330d0fe12153370741ec98cb1172ece849
Merge branch 4.5 into master

Conflicts:
CRM/Report/Form.php
CRM/Report/Form/Activity.php
CRM/Utils/File.php
CRM/Core/DAO/permissions.php
CRM/Report/Form.php
CRM/Report/Form/Activity.php
CRM/Utils/File.php