Merge pull request #8933 from ejegg/mergeNotices
authorEileen McNaughton <eileen@mcnaughty.com>
Fri, 26 Aug 2016 02:40:52 +0000 (14:40 +1200)
committerGitHub <noreply@github.com>
Fri, 26 Aug 2016 02:40:52 +0000 (14:40 +1200)
commitc2a6d23171c4e36750022f187f5fb6325149654c
tree5d897b78786285965fedcd3f15976862a024bc48
parent962c5e22c5f7fd5dda96df6c61ffc1d3c8a79b1e
parentdc7a41cb6b5037ca532c78920983fef16f931424
Merge pull request #8933 from ejegg/mergeNotices

Fix undefined index notices in merge