Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-11-11-10-56-09
authorkurund <kurund@civicrm.org>
Mon, 11 Nov 2013 05:27:27 +0000 (10:57 +0530)
committerkurund <kurund@civicrm.org>
Mon, 11 Nov 2013 05:27:27 +0000 (10:57 +0530)
commit5b8739fa11c572c4a3556601cbb7ddb7695bea94
tree5ac4119f7a24bd515f861da3c0e9d56c78e245f2
parent6a874f81d3d116d221f17ea4ade967992364cb94
parent7791c05ff3b621589d135f3a01189d7f0a563db9
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
12 files changed:
CRM/Activity/BAO/Activity.php
CRM/Admin/Page/OptionValue.php
CRM/Contact/BAO/Contact/Utils.php
CRM/Contact/BAO/Query.php
CRM/Core/BAO/CustomGroup.php
CRM/Core/BAO/UFGroup.php
CRM/Mailing/BAO/Mailing.php
CRM/Report/Form.php
CRM/Utils/Migrate/ExportJSON.php
api/v3/Contact.php
bin/cli.class.php
xml/templates/civicrm_data.tpl