Bug 1059694 - fixing log levels settings. r=nthomas
Bug 1072465 - bump bash version. r=jwatkins
Merging from default

changeset:   2300:968bfccdf2fd
parent:      2298:c8e92078cd5a
user:        Simone Bruno <sbruno@mozilla.com>
date:        Fri Sep 26 10:20:24 2014 +0200
summary:     Bug 1059694 - fixing log levels settings. r=nthomas

changeset:   2301:d781d1e9e702
tag:         tip
user:        Rail Aliiev <rail@mozilla.com>
date:        Fri Sep 26 13:15:46 2014 -0400
summary:     Bug 1072465 - bump bash version. r=jwatkins

--HG--
branch : production