Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-04-07-15-32-51
authorTim Otten <totten@civicrm.org>
Mon, 7 Apr 2014 22:34:43 +0000 (15:34 -0700)
committerTim Otten <totten@civicrm.org>
Mon, 7 Apr 2014 22:34:43 +0000 (15:34 -0700)
commitafed0de9c0305abb1c011d6e87fd5e7a1ddee543
treedd4675470b1a1124dd6c255e250f0b4c7eb3a250
parentf4d1ab14c649275b56e3dd0947f9de042744e6d5
parent707615f5e1a3a95c83510d2afcaa9a7653489ac7
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-04-07-15-32-51

Conflicts:
api/v3/Membership.php
api/v3/Job.php
api/v3/Membership.php