projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ba021dc 46332f2)
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)
Merge fix - membership api - merged incorrectly from 4.4 to master


Trivial merge