From: Kurund Jalmi <kurund@yahoo.com>
Date: Thu, 6 Aug 2015 15:10:24 +0000 (+0530)
Subject: Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-08-06-19-31-58
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=0f1428e71dd43dc0b146d18a64aa51cd7ac832da;p=civicrm-core.git

Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-08-06-19-31-58

Conflicts:
	CRM/Upgrade/Incremental/php/FourSix.php
	sql/civicrm_generated.mysql
	xml/version.xml
---

0f1428e71dd43dc0b146d18a64aa51cd7ac832da