Bug 1078507 - undo unintended change to Makefile.master - r=bustage
Merging from default

changeset:   11160:469791fa7a93
tag:         tip
parent:      11158:1cc91f73ddca
user:        Chris Cooper <ccooper@deadsquid.com>
date:        Thu Oct 09 14:31:52 2014 -0400
summary:     Bug 1078507 - undo unintended change to Makefile.master - r=bustage

--HG--
branch : production