Merge pull request #4597 from eileenmcnaughton/4.4
authorEileen McNaughton <eileen@mcnaughty.com>
Sat, 22 Nov 2014 10:13:12 +0000 (23:13 +1300)
committerEileen McNaughton <eileen@mcnaughty.com>
Sat, 22 Nov 2014 10:13:12 +0000 (23:13 +1300)
commita594fff303a483d81de67c08ae717d7f1a94486d
tree88615a886415f54c8cde59a94bccb8400185659f
parenta9020a7f77f1e76f9f04a663134e2512e2b94adf
parent9fc9b4448415c87527856193dae48dd6832e3605
Merge pull request #4597 from eileenmcnaughton/4.4

minor backports (more for consistency but php warning fixes)