From: kurund <kurund@civicrm.org>
Date: Mon, 21 Oct 2013 18:36:28 +0000 (+0530)
Subject: Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-10-22-00-05-43
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=78a22bc2b5c0fd4868a5bf7f6bb3634ef6327178;p=civicrm-core.git

Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-10-22-00-05-43

Conflicts:
	sql/civicrm_generated.mysql
---

78a22bc2b5c0fd4868a5bf7f6bb3634ef6327178