Merge pull request #7536 from eileenmcnaughton/backport-apis
authorEileen McNaughton <eileen@mcnaughty.com>
Tue, 5 Jan 2016 20:23:24 +0000 (09:23 +1300)
committerEileen McNaughton <eileen@mcnaughty.com>
Tue, 5 Jan 2016 20:23:24 +0000 (09:23 +1300)
commit457e2966fff6a92175c9c78529eb8c14d6a14bce
tree244c4a8c5b4b8fc75c5c1c86bd4b11b22233f21f
parent14a924cd76690c9624cc8cc87dbd968cce64c6eb
parentde7f5c381632c6bcec82be5b80c6f7e9d93e4e17
Merge pull request #7536 from eileenmcnaughton/backport-apis

Backport apis