From: Eileen McNaughton <eileen@mcnaughty.com>
Date: Sun, 27 Apr 2014 07:48:25 +0000 (-0700)
Subject: Merge pull request #2947 from eileenmcnaughton/merge-fix
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=b3e9c4cfb98d3962cfe9cd20995425eb5a8fac54;p=civicrm-core.git

Merge pull request #2947 from eileenmcnaughton/merge-fix

Merge fix - membership api - merged incorrectly from 4.4 to master
---

b3e9c4cfb98d3962cfe9cd20995425eb5a8fac54