From: kurund <kurund@civicrm.org>
Date: Thu, 28 May 2015 17:39:08 +0000 (+0530)
Subject: Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-05-28-22-50-49
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=339572088621ed2b6d3a74ff12e82b40d835965c;p=civicrm-core.git

Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-05-28-22-50-49

Conflicts:
	ang/crmUi.js
	sql/civicrm_generated.mysql
	xml/version.xml
---

339572088621ed2b6d3a74ff12e82b40d835965c