Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-01-27-22-52-52
authorkurund <kurund@civicrm.org>
Tue, 28 Jan 2014 03:59:18 +0000 (22:59 -0500)
committerkurund <kurund@civicrm.org>
Tue, 28 Jan 2014 03:59:18 +0000 (22:59 -0500)
commit6a00ff0d395476086d4c4b4fe3ba48672280dd1a
tree120083116612551e638d6f58b974589610367018
parentb9500f7b49adf5041c16db0121be8b873dea69b6
parentc192fbee3a19b564a9f87191dac5324bc48147e9
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-01-27-22-52-52

Conflicts:
sql/civicrm_generated.mysql
CRM/Activity/BAO/Activity.php
CRM/Contact/Form/Domain.php
CRM/Report/Form.php
CRM/Report/Form/Activity.php
CRM/UF/Page/Group.php
CRM/Utils/Address/BatchUpdate.php
sql/civicrm_generated.mysql
xml/templates/civicrm_navigation.tpl