Merge pull request #6404 from eileenmcnaughton/master
authorEileen McNaughton <eileen@mcnaughty.com>
Tue, 4 Aug 2015 18:06:52 +0000 (06:06 +1200)
committerEileen McNaughton <eileen@mcnaughty.com>
Tue, 4 Aug 2015 18:06:52 +0000 (06:06 +1200)
remove some unused variables


Trivial merge