Bug 1013493: Disable merging of builds on trunk + release branches. r=rail
Merging from default

changeset:   11501:9d05b7845146
tag:         tip
parent:      11499:bcc818aca84e
user:        Chris AtLee <catlee@mozilla.com>
date:        Fri Nov 28 10:30:05 2014 -0500
summary:     Bug 1013493: Disable merging of builds on trunk + release branches. r=rail

--HG--
branch : production