Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-04-03-23-46-36
authorTim Otten <totten@civicrm.org>
Fri, 4 Apr 2014 07:07:02 +0000 (00:07 -0700)
committerTim Otten <totten@civicrm.org>
Fri, 4 Apr 2014 07:07:02 +0000 (00:07 -0700)
commit00ca8648aca9637f2678082ce09f98772533a8cc
treed5680e88a1f1a795d80d19f8353aecc0bb92e816
parent017f329569133bc6447bc5fa5cf9eb521e390e08
parent27d3251c6383ab0d1b8f482a69b970d9c522a3d0
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-04-03-23-46-36

Conflicts:
CRM/Activity/Page/AJAX.php
CRM/Member/Form/Membership.php
js/rest.js
templates/CRM/Campaign/Form/Task/Interview.tpl
CRM/Activity/Page/AJAX.php
CRM/Core/Payment/eWAY.php
CRM/Price/Form/Option.php
CRM/Profile/Selector/Listings.php
CRM/Utils/System/Drupal.php
CRM/Utils/System/Drupal6.php
api/v3/Activity.php
api/v3/Contribution.php
api/v3/Job.php
templates/CRM/Campaign/Form/Task/Interview.tpl