Merge pull request #2308 from civicrm/4.4
authorcolemanw <coleman@civicrm.org>
Wed, 8 Jan 2014 06:20:52 +0000 (22:20 -0800)
committercolemanw <coleman@civicrm.org>
Wed, 8 Jan 2014 06:20:52 +0000 (22:20 -0800)
commit730507f70920a6ae9077976fd501e5ccac2fb4b7
tree4cd760bcc89d8e14577100e281b363e2f54040fa
parent1edebc7266e54526554cbbce893cbdbf08d5cbd9
parentce0f6cdbe0420f8b25f458b262b2330a21b94e9d
Merge pull request #2308 from civicrm/4.4

Merge branch 4.4 into master
CRM/Contact/Form/Edit/CommunicationPreferences.php
CRM/Contact/Form/Inline/CommunicationPreferences.php
CRM/Contribute/Form/Contribution/Main.php
CRM/Export/BAO/Export.php
CRM/Member/BAO/Membership.php