From: kurund <kurund@civicrm.org>
Date: Thu, 2 Jul 2015 05:36:12 +0000 (+0530)
Subject: Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-07-02-11-04-42
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=2748acb994299a226b9053de3638e059e4945128;p=civicrm-core.git

Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-07-02-11-04-42

Conflicts:
	tests/phpunit/api/v3/SyntaxConformanceTest.php
---

2748acb994299a226b9053de3638e059e4945128