Merge pull request #2308 from civicrm/4.4

Merge branch 4.4 into master

diff --cc CRM/Contact/Form/Edit/CommunicationPreferences.php
Simple merge

diff --cc CRM/Contact/Form/Inline/CommunicationPreferences.php
Simple merge

diff --cc CRM/Contribute/Form/Contribution/Main.php
Simple merge

diff --cc CRM/Export/BAO/Export.php
Simple merge

diff --cc CRM/Member/BAO/Membership.php
Simple merge