Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-03-14-00-44-17
authorkurund <kurund@civicrm.org>
Thu, 13 Mar 2014 19:17:47 +0000 (00:47 +0530)
committerkurund <kurund@civicrm.org>
Thu, 13 Mar 2014 19:17:47 +0000 (00:47 +0530)
commitc1c7a930efe9d1539a018b16d5725933e4843d2b
tree3bba973935cf7fa8343696ef393966ede1eddacf
parent1a676f190f24b5633b76b90a7dda95f2cc5b4dce
parent165a151ab63e259006fa0671b2d8fd3bd9c89827
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-03-14-00-44-17

Conflicts:
CRM/Export/BAO/Export.php
xml/GenCode.php
CRM/Contact/BAO/Query.php
CRM/Contribute/Form/Contribution/Confirm.php
CRM/Core/Error.php
CRM/Event/Form/Participant.php
CRM/Export/BAO/Export.php
CRM/Mailing/BAO/Mailing.php
CRM/Member/BAO/Membership.php
CRM/Member/BAO/Query.php
templates/CRM/Activity/Form/ActivityJs.tpl
templates/CRM/Contact/Form/Inline/ContactInfo.tpl
templates/CRM/Contact/Page/View/Summary.js