bug 926325 - Refactored test to avoid js errors in test run; r=mikeratcliffe
Bug 928217 - Enable core location geolocation conditionally. r=jdm/smichaud
Merge m-c to m-i
 Bug 928712 - Remove the rest of the unneeded prtypes.h inclusions; rs=bsmedberg
Bug 928765 - Create MediaDecoderReader::GetBuffered() base implementation that estimates buffered ranges, so that subclasses do have to keep reimplementing the estimation. r=doublec
Merge fx-team to Mozilla-Central
Merge mozilla-central to fx-team
Bug 754344 - Make in-content prefs navigation look like about:addons