Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-03-03-17-36-50
authorTim Otten <totten@civicrm.org>
Tue, 4 Mar 2014 01:37:01 +0000 (17:37 -0800)
committerTim Otten <totten@civicrm.org>
Tue, 4 Mar 2014 01:37:01 +0000 (17:37 -0800)
commitba4d65467bdf14b7ac4d5efce468f5e4867129f9
tree2502972e761797c0f6d929f4af5f7b369a3a2340
parentd212e1b4832c02c5544ddfee01aa291ab902e361
parent30c3cbc4f60804954b8f0c869058655dc7bcc0ca
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-03-03-17-36-50
CRM/Core/Controller.php
install/civicrm.php