Merge remote-tracking branch 'upstream/4.4' into 4.4-4.5-2014-10-14-11-16-10
authorkurund <kurund@civicrm.org>
Tue, 14 Oct 2014 05:52:18 +0000 (11:22 +0530)
committerkurund <kurund@civicrm.org>
Tue, 14 Oct 2014 05:52:18 +0000 (11:22 +0530)
commit42bf93368ea81b2fa70fab038f3c884755e1ab88
treef2f19f83fad8a1755673d58ca82fa5a602a4569e
parent31a146abe76acc0a914da1e2c98e6c9179741111
parent21f4b6087e0bf1da354eee40927fc4a9a7564aa0
Merge remote-tracking branch 'upstream/4.4' into 4.4-4.5-2014-10-14-11-16-10

Conflicts:
api/v3/System.php
tests/phpunit/api/v3/SystemTest.php
api/v3/System.php
tests/phpunit/api/v3/SystemTest.php