Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-04-04-00-08-28
authorTim Otten <totten@civicrm.org>
Fri, 4 Apr 2014 07:09:06 +0000 (00:09 -0700)
committerTim Otten <totten@civicrm.org>
Fri, 4 Apr 2014 07:09:06 +0000 (00:09 -0700)
commitc90a093af5607c80a76a7af50f76d2c1d5bf4f37
treeb4821d19523fe8c0f4969056b79377b3f5f631ed
parent00ca8648aca9637f2678082ce09f98772533a8cc
parent39720dbd991d8343379d862b7767ac69f49c56a7
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-04-04-00-08-28

Conflicts:
CRM/Core/Page.php
CRM/Core/Page.php
CRM/Utils/Check/Message.php
CRM/Utils/Check/Security.php
api/v3/System.php
tests/phpunit/CiviTest/CiviUnitTestCase.php