Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-12-16-21-42-04
authorkurund <kurund@civicrm.org>
Tue, 17 Dec 2013 05:52:38 +0000 (21:52 -0800)
committerkurund <kurund@civicrm.org>
Tue, 17 Dec 2013 05:52:38 +0000 (21:52 -0800)
commited0d980a1603209bcb6cfd5ac308a9d96db7e70b
tree004414c7a27dabea8f7ad6a9907d9e2da272b703
parentd23b9646e31d8771f43db7e7ff056c4730d94314
parent291e6eee065e4226daf2ee824bb7ebdb6e0434da
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-12-16-21-42-04

Conflicts:
CRM/Event/BAO/Participant.php
templates/CRM/common/Navigation.tpl
CRM/Contact/BAO/Contact.php
CRM/Contact/BAO/Query.php
CRM/Contact/Form/Inline/CommunicationPreferences.php
CRM/Contribute/Form/Contribution.php
CRM/Core/BAO/ActionSchedule.php
CRM/Mailing/BAO/Mailing.php
CRM/Report/Form.php
CRM/Report/Form/Contribute/Detail.php