Merge pull request #2947 from eileenmcnaughton/merge-fix
authorEileen McNaughton <eileen@mcnaughty.com>
Sun, 27 Apr 2014 07:48:25 +0000 (00:48 -0700)
committerEileen McNaughton <eileen@mcnaughty.com>
Sun, 27 Apr 2014 07:48:25 +0000 (00:48 -0700)
commitb3e9c4cfb98d3962cfe9cd20995425eb5a8fac54
tree02f95882189f44bc865715dc3150925936f90d08
parentba021dc09077df85043207b3d5f50b61cf5d2906
parent46332f2b155595d51fa3c87a12afcfe489a9697f
Merge pull request #2947 from eileenmcnaughton/merge-fix

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