Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-10-22-00-05-43
authorkurund <kurund@civicrm.org>
Mon, 21 Oct 2013 18:36:28 +0000 (00:06 +0530)
committerkurund <kurund@civicrm.org>
Mon, 21 Oct 2013 18:36:28 +0000 (00:06 +0530)
commit78a22bc2b5c0fd4868a5bf7f6bb3634ef6327178
treed9ad8d1148fc6f0f4a5b752e5ecaeb9745af8e16
parent237861911c8497b390b9ef5baf98f924a52354b6
parent35598dc5bbdd980bc0d93e7348d844f519acd504
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-10-22-00-05-43

Conflicts:
sql/civicrm_generated.mysql
CRM/Contact/BAO/Query.php