From: kurund <kurund@civicrm.org>
Date: Mon, 11 Nov 2013 05:27:27 +0000 (+0530)
Subject: Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-11-11-10-56-09
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=5b8739fa11c572c4a3556601cbb7ddb7695bea94;p=civicrm-core.git

Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-11-11-10-56-09

Conflicts:
	sql/civicrm_generated.mysql
	xml/version.xml
---

5b8739fa11c572c4a3556601cbb7ddb7695bea94