Merge pull request #7562 from yashodha/contributors
authorEileen McNaughton <eileen@mcnaughty.com>
Sun, 10 Jan 2016 23:21:42 +0000 (12:21 +1300)
committerEileen McNaughton <eileen@mcnaughty.com>
Sun, 10 Jan 2016 23:21:42 +0000 (12:21 +1300)
update the list of contributors for 4.7


Trivial merge