Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-12-04-15-16-31
authorkurund <kurund@civicrm.org>
Wed, 4 Dec 2013 23:22:27 +0000 (15:22 -0800)
committerkurund <kurund@civicrm.org>
Wed, 4 Dec 2013 23:22:27 +0000 (15:22 -0800)
commit9eab4fddbeaf95513c29986f88aed802db62eda3
treef05178b5686caaa38bd7f4a14b72207d4a35cb08
parentd161de0691dfd7d6f8cf36e6ceca7db771427a50
parentdc2703b9691d2a6da2e4cdee9bdc075afb9b5ca5
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-12-04-15-16-31

Conflicts:
CRM/Admin/Form/Options.php
api/v3/Contact.php
sql/civicrm_generated.mysql
CRM/Activity/BAO/Activity.php
CRM/Admin/Form/Options.php
CRM/Admin/Page/Options.php
CRM/Contact/BAO/Query.php
CRM/Contact/BAO/Relationship.php
CRM/Core/Resources.php
CRM/Event/BAO/Event.php
CRM/Export/BAO/Export.php
CRM/Report/Form.php
install/index.php
xml/templates/civicrm_data.tpl