Bug 1015942 - tracking bug for build and release of thunderbird 31.0. r=bhearsum
Merging from default

changeset:   10668:e52ce5cfec61
tag:         tip
parent:      10666:ee8c305143ba
user:        Rail Aliiev <rail@mozilla.com>
date:        Tue Jul 15 10:15:12 2014 -0400
summary:     Bug 1015942 - tracking bug for build and release of thunderbird 31.0. r=bhearsum

--HG--
branch : production