Bug 1014047: fix typo; a=bustage
Merge production -> default
Bug 1027134 - manage_instance_storage.py should consider root  volume size. r=catlee
Merging from default

changeset:   1867:e4d5f77e430e
parent:      1864:c79fec8e3151
user:        Dustin J. Mitchell <dustin@mozilla.com>
date:        Thu Jun 19 12:28:56 2014 -0400
summary:     Bug 1014047: fix typo; a=bustage

changeset:   1870:d8ea9f99f90a
parent:      1867:e4d5f77e430e
parent:      1869:7935eae6c7e2
user:        Dustin J. Mitchell <dustin@mozilla.com>
date:        Thu Jun 19 15:26:04 2014 -0400
summary:     Merge production -> default

changeset:   1871:8fab8e1860ea
tag:         tip
user:        Rail Aliiev <rail@mozilla.com>
date:        Thu Jun 19 15:29:14 2014 -0400
summary:     Bug 1027134 - manage_instance_storage.py should consider root  volume size. r=catlee

--HG--
branch : production